trenger ikke sette tag selv

Co-authored-by: Erik Maximilian Forsman <[email protected]>
navikt · Jan 11, 2024 · c3b4123 · c3b4123
1 parent 73f4d49
commit c3b4123
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 44 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -20,19 +20,9 @@ env:
   ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  set_version:
-    name: set image name
-    runs-on: ubuntu-latest
-    steps:
-      - name: create docker tag
-        run: echo "TAG=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
-    outputs:
-      tag: ${{ env.TAG }}
-
   build:
     name: build docker image
     runs-on: ubuntu-latest-16-cores
-    needs: set_version
     permissions:
       id-token: write
     steps:
@@ -50,7 +40,6 @@ jobs:
         with:
           team: tbd
           image_suffix: spleis
-          tag: ${{ needs.set_version.outputs.tag }}
           docker_context: sykepenger-mediators
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}

diff --git a/.github/workflows/spleis-api.yml b/.github/workflows/spleis-api.yml
@@ -17,19 +17,9 @@ env:
   ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  set_version:
-    name: set image name
-    runs-on: ubuntu-latest
-    steps:
-      - name: create docker tag
-        run: echo "TAG=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
-    outputs:
-      tag: ${{ env.TAG }}
-
   build:
     name: build docker image
     runs-on: ubuntu-latest
-    needs: set_version
     permissions:
       id-token: write
     steps:
@@ -47,7 +37,6 @@ jobs:
         with:
           team: tbd
           image_suffix: api
-          tag: ${{ needs.set_version.outputs.tag }}
           docker_context: sykepenger-api
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}

diff --git a/.github/workflows/spleis-jobs.yml b/.github/workflows/spleis-jobs.yml
@@ -17,19 +17,9 @@ env:
   ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  set_version:
-    name: set image name
-    runs-on: ubuntu-latest
-    steps:
-      - name: create docker tag
-        run: echo "TAG=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
-    outputs:
-      tag: ${{ env.TAG }}
-
   build:
     name: build docker image
     runs-on: ubuntu-latest
-    needs: set_version
     permissions:
       id-token: write
     steps:
@@ -47,7 +37,6 @@ jobs:
         with:
           team: tbd
           image_suffix: jobs
-          tag: ${{ needs.set_version.outputs.tag }}
           docker_context: jobs
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}

diff --git a/.github/workflows/spleis-opprydding-dev.yml b/.github/workflows/spleis-opprydding-dev.yml
@@ -15,19 +15,9 @@ env:
   ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  set_version:
-    name: set image name
-    runs-on: ubuntu-latest
-    steps:
-      - name: create docker tag
-        run: echo "TAG=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
-    outputs:
-      tag: ${{ env.TAG }}
-
   build:
     name: build docker image
     runs-on: ubuntu-latest
-    needs: set_version
     permissions:
       id-token: write
     steps:
@@ -45,7 +35,6 @@ jobs:
         with:
           team: tbd
           image_suffix: sykepenger-opprydding-dev
-          tag: ${{ needs.set_version.outputs.tag }}
           docker_context: sykepenger-opprydding-dev
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}