From 239f14597b7c8270ef52d86df5e5ff47eed8bfd9 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 3 Apr 2024 11:08:17 +0200 Subject: [PATCH 1/3] chore(linux): Checkout source before building binary packages Since we use an action that is defined in our source tree we have to checkout the source before we can build the binary packages. --- .github/workflows/deb-packaging.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 4c2eff56dab..5b21a91c338 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -119,6 +119,12 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0 + with: + ref: '${{ github.event.client_payload.buildSha }}' + sparse-checkout: '.github/actions/' + - name: Build uses: ./.github/actions/build-binary-packages with: @@ -138,6 +144,12 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0 + with: + ref: '${{ github.event.client_payload.buildSha }}' + sparse-checkout: '.github/actions/' + - name: Build continue-on-error: true uses: ./.github/actions/build-binary-packages From 104680b2bdf1dfda84d792215deaa51d2012f167 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 3 Apr 2024 11:14:14 +0200 Subject: [PATCH 2/3] chore(linux): Update checkout action to v4.1.1 --- .github/workflows/deb-packaging.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 5b21a91c338..2367bfb2d14 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -30,7 +30,7 @@ jobs: PRERELEASE_TAG: ${{ steps.prerelease_tag.outputs.PRERELEASE_TAG }} steps: - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 with: ref: '${{ github.event.client_payload.buildSha }}' @@ -120,7 +120,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 with: ref: '${{ github.event.client_payload.buildSha }}' sparse-checkout: '.github/actions/' @@ -145,7 +145,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 with: ref: '${{ github.event.client_payload.buildSha }}' sparse-checkout: '.github/actions/' From 2fe4da7cca369558a5696f82bf618b42d4cd6f8d Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 3 Apr 2024 11:20:27 +0200 Subject: [PATCH 3/3] chore(linux): Ignore failed package builds for next Ubuntu differently Previously failed package builds for the next Ubuntu release showed up with a green check mark. This change allows them to fail, but ignores them for the following steps. --- .github/workflows/deb-packaging.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 2367bfb2d14..27c3f11c8d8 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -151,7 +151,6 @@ jobs: sparse-checkout: '.github/actions/' - name: Build - continue-on-error: true uses: ./.github/actions/build-binary-packages with: dist: ${{ matrix.dist }} @@ -194,7 +193,7 @@ jobs: needs: [sourcepackage, binary_packages_released, binary_packages_unreleased] runs-on: ubuntu-latest environment: "deploy (linux)" - if: github.event.client_payload.isTestBuild == 'false' + if: ${{ github.event.client_payload.isTestBuild == 'false' && needs.sourcepackage.result == 'success' && needs.binary_packages_released.result == 'success' }} steps: - name: Sign packages @@ -212,7 +211,7 @@ jobs: needs: [sourcepackage, deb_signing] runs-on: self-hosted environment: "deploy (linux)" - if: github.event.client_payload.isTestBuild == 'false' + if: ${{ github.event.client_payload.isTestBuild == 'false' && needs.sourcepackage.result == 'success' && needs.deb_signing.result == 'success' }} steps: - name: Install dput @@ -295,6 +294,7 @@ jobs: name: Verify API for libkeymancore.so needs: [sourcepackage, binary_packages_released] runs-on: ubuntu-latest + if: ${{ needs.sourcepackage.result == 'success' && needs.binary_packages_released.result == 'success' }} steps: - name: Checkout