From b44ec4841c6974134dcd49dddd1bd12b0e84a2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Steinar=20Lillest=C3=B8l=20Skrede?= Date: Sun, 31 Dec 2023 16:33:24 +0100 Subject: [PATCH] =?UTF-8?q?pr=C3=B8v=20=C3=A5=20fikse=20imagename?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-dev.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index c7120cb4..a8829bfb 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -41,6 +41,11 @@ jobs: #- uses: navikt/digihot-deploy/actions/pre-deploy@v2 # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Pre-deploy + uses: navikt/digihot-deploy/actions/pre-deploy@v3 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Push docker image to GAR uses: nais/docker-build-push@v0 id: docker-build-push @@ -48,7 +53,8 @@ jobs: team: teamdigihot # image_suffix: hotsak-frontend identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} - project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} + project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} + tag: ${{ env.VERSION_TAG }} deploy-labs: name: Deploy til labs-gcp @@ -76,10 +82,12 @@ jobs: timeout-minutes: 15 steps: - uses: actions/checkout@v4 + - name: Pre-deploy uses: navikt/digihot-deploy/actions/pre-deploy@v3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: nais/deploy/actions/deploy@v2 env: CLUSTER: dev-gcp @@ -95,11 +103,10 @@ jobs: - uses: actions/create-release@latest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: tag_name: ${{ env.VERSION_TAG }} release_name: hotsak-frontend ${{ env.VERSION_TAG }} - #body: ${{ env.CHANGE_LOG }} + body: ${{ env.CHANGE_LOG }} draft: true prerelease: false