From 02286dfa99752e4449b72587fd1dbc438012e676 Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Tue, 12 Dec 2023 10:08:30 +0100 Subject: [PATCH 1/3] Use a matrix Signed-off-by: Mauro Morales --- .github/workflows/build.yaml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1682f86..5a06a76 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,27 +22,23 @@ jobs: path: | versions_generic.old.yaml versions_fips.old.yaml - build-generic: + build: permissions: id-token: write # OIDC support contents: write - uses: ./.github/workflows/reusable-build.yaml secrets: inherit - with: - security_profile: generic - build-fips: - permissions: - id-token: write # OIDC support - contents: write + strategy: + fail-fast: false + matrix: + security_profile: [generic, fips] uses: ./.github/workflows/reusable-build.yaml - secrets: inherit with: - security_profile: fips + security_profile: ${{ matrix.security_profile }}} comment-pr: runs-on: ubuntu-latest permissions: pull-requests: write - needs: [build-generic, build-fips, get-old-versions] + needs: [build, get-old-versions] steps: - uses: actions/checkout@v4 - name: Download versions From 83d7d1ebf63c484c398426acdfc6f717dedfc0ce Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Tue, 12 Dec 2023 10:27:16 +0100 Subject: [PATCH 2/3] typo Signed-off-by: Mauro Morales --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5a06a76..02ca80a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,7 +33,7 @@ jobs: security_profile: [generic, fips] uses: ./.github/workflows/reusable-build.yaml with: - security_profile: ${{ matrix.security_profile }}} + security_profile: ${{ matrix.security_profile }} comment-pr: runs-on: ubuntu-latest permissions: From 40f752c88fa7170419d87436306d492ae505b4cc Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Tue, 12 Dec 2023 11:13:18 +0100 Subject: [PATCH 3/3] Use matrix also on release pipeline Signed-off-by: Mauro Morales --- .github/workflows/release.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 83ec1be..d62ebb0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,19 +8,15 @@ on: - main jobs: - build-framework: + build: permissions: id-token: write # OIDC support contents: write - uses: ./.github/workflows/reusable-build.yaml secrets: inherit - with: - security_profile: generic - build-framework-fips: - permissions: - id-token: write # OIDC support - contents: write + strategy: + fail-fast: false + matrix: + security_profile: [generic, fips] uses: ./.github/workflows/reusable-build.yaml - secrets: inherit with: - security_profile: fips \ No newline at end of file + security_profile: ${{ matrix.security_profile }} \ No newline at end of file