From 1d498d4885419408d529e1f28eb43461742f5dbc Mon Sep 17 00:00:00 2001 From: pweick Date: Wed, 3 Jul 2024 14:32:54 +0200 Subject: [PATCH] fix(release): release workflow executes subsequent workflows correctly --- .github/workflows/helm-chart-release.yaml | 6 ++---- .github/workflows/irs-build.yml | 9 +++------ .github/workflows/release.yaml | 8 ++++---- .github/workflows/swagger-editor-validate.yml | 3 +-- .github/workflows/trivy-image-scan.yml | 3 +-- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml index fbe491edd..adc2bf6b4 100644 --- a/.github/workflows/helm-chart-release.yaml +++ b/.github/workflows/helm-chart-release.yaml @@ -49,8 +49,7 @@ jobs: with: fetch-depth: 0 fetch-tags: 'true' - - - run: git checkout ${{ needs.determine-ref.outputs.ref }} + ref: ${{ needs.determine-ref.outputs.ref }} - name: Get helm charts latest tag version id: step1 @@ -79,8 +78,7 @@ jobs: with: fetch-depth: 0 fetch-tags: 'true' - - - run: git checkout ${{ needs.determine-ref.outputs.ref }} + ref: ${{ needs.determine-ref.outputs.ref }} - name: Configure Git run: | diff --git a/.github/workflows/irs-build.yml b/.github/workflows/irs-build.yml index 6f1336f74..19af9e266 100644 --- a/.github/workflows/irs-build.yml +++ b/.github/workflows/irs-build.yml @@ -67,8 +67,7 @@ jobs: uses: actions/checkout@v4 with: fetch-tags: 'true' - - - run: git checkout ${{ needs.determine-ref.outputs.ref }} + ref: ${{ needs.determine-ref.outputs.ref }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -100,8 +99,7 @@ jobs: with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of sonar analysis fetch-tags: 'true' - - - run: git checkout ${{ needs.determine-ref.outputs.ref }} + ref: ${{ needs.determine-ref.outputs.ref }} - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -146,8 +144,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-tags: 'true' - - - run: git checkout ${{ needs.determine-ref.outputs.ref }} + ref: ${{ needs.determine-ref.outputs.ref }} - name: Build image to make sure Dockerfile is valid run: | diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a8a536d1e..7484a1f90 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -216,7 +216,7 @@ jobs: uses: ./.github/workflows/helm-chart-release.yaml with: checkout-tag: true - ref-to-checkout: '${{ inputs.irs-version }}' + ref-to-checkout: 'refs/tags/${{ inputs.irs-version }}' build-irs: name: "Build IRS" @@ -226,7 +226,7 @@ jobs: secrets: inherit with: checkout-tag: true - ref-to-checkout: '${{ inputs.irs-version }}' + ref-to-checkout: 'refs/tags/${{ inputs.irs-version }}' trivy-image-scan: name: "Scan image in local registry with Trivy" @@ -236,7 +236,7 @@ jobs: secrets: inherit with: checkout-tag: true - ref-to-checkout: '${{ inputs.irs-version }}' + ref-to-checkout: 'refs/tags/${{ inputs.irs-version }}' validate-openapi-definition: needs: @@ -246,4 +246,4 @@ jobs: secrets: inherit with: checkout-tag: true - ref-to-checkout: '${{ inputs.irs-version }}' \ No newline at end of file + ref-to-checkout: 'refs/tags/${{ inputs.irs-version }}' \ No newline at end of file diff --git a/.github/workflows/swagger-editor-validate.yml b/.github/workflows/swagger-editor-validate.yml index 49d3dac91..3a3742690 100644 --- a/.github/workflows/swagger-editor-validate.yml +++ b/.github/workflows/swagger-editor-validate.yml @@ -46,8 +46,7 @@ jobs: uses: actions/checkout@v4 with: fetch-tags: 'true' - - - run: git checkout ${{ needs.determine-ref.outputs.ref }} + ref: ${{ needs.determine-ref.outputs.ref }} - name: Validate OpenAPI definition uses: char0n/swagger-editor-validate@v1 diff --git a/.github/workflows/trivy-image-scan.yml b/.github/workflows/trivy-image-scan.yml index fb8422087..c0bca2012 100644 --- a/.github/workflows/trivy-image-scan.yml +++ b/.github/workflows/trivy-image-scan.yml @@ -66,8 +66,7 @@ jobs: uses: actions/checkout@v4 with: fetch-tags: 'true' - - - run: git checkout ${{ needs.determine-ref.outputs.ref }} + ref: ${{ needs.determine-ref.outputs.ref }} - name: Build image uses: docker/build-push-action@v6