Skip to content

Commit 0da0f6a

Browse files
authored
Merge pull request #383 from coreruleset/chore/replace-bake-subaction
chore: update bake matrix subaction
2 parents 56735fc + 2fa695e commit 0da0f6a

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

.github/workflows/publish.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ jobs:
88
prepare:
99
runs-on: ubuntu-latest
1010
outputs:
11-
targets: ${{ steps.generate.outputs.targets }}
11+
matrix: ${{ steps.generate.outputs.matrix }}
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # actions/checkout@v5
1515
- name: List targets
1616
id: generate
17-
uses: docker/bake-action/subaction/list-targets@3acf805d94d93a86cce4ca44798a76464a75b88c # docker/bake-action/subaction/list-targets@v6
17+
uses: docker/bake-action/subaction/matrix@v6
18+
with:
19+
target: default
1820

1921
build:
2022
name: Build ${{ matrix.target }}
@@ -27,7 +29,7 @@ jobs:
2729
id-token: write # needed for signing the images with GitHub OIDC Token
2830
strategy:
2931
matrix:
30-
target: ${{ fromJson(needs.prepare.outputs.targets) }}
32+
include: ${{ fromJson(needs.prepare.outputs.matrix) }}
3133
steps:
3234
- name: Checkout
3335
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # actions/checkout@v5

.github/workflows/verifyimage.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ jobs:
1313
prepare:
1414
runs-on: ubuntu-latest
1515
outputs:
16-
targets: ${{ steps.generate.outputs.targets }}
16+
matrix: ${{ steps.generate.outputs.matrix }}
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # actions/checkout@v5
20-
- name: List targets
20+
- name: Generate matrix
2121
id: generate
22-
uses: docker/bake-action/subaction/list-targets@3acf805d94d93a86cce4ca44798a76464a75b88c # docker/bake-action/subaction/list-targets@v6
22+
uses: docker/bake-action/subaction/matrix@v6
23+
with:
24+
target: default
2325
- name: Check modsecurity recommended
2426
run: |
2527
curl -sSL https://raw.githubusercontent.com/owasp-modsecurity/ModSecurity/v3/master/modsecurity.conf-recommended -o modsecurity.conf-recommended
@@ -32,7 +34,7 @@ jobs:
3234
- prepare
3335
strategy:
3436
matrix:
35-
target: ${{ fromJson(needs.prepare.outputs.targets) }}
37+
include: ${{ fromJson(needs.prepare.outputs.matrix) }}
3638
steps:
3739
- name: Checkout
3840
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # actions/checkout@v5

0 commit comments

Comments
 (0)