Skip to content

Commit dcaf102

Browse files
committed
ci, refactor: Generalize use of matrix.configuration.env_vars
1 parent ef3b514 commit dcaf102

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ jobs:
132132
strategy:
133133
fail-fast: false
134134
matrix:
135+
configuration:
136+
- env_vars: {}
135137
cc:
136138
- 'i686-linux-gnu-gcc'
137139
- 'clang --target=i686-pc-linux-gnu -isystem /usr/i686-linux-gnu/include'
@@ -150,6 +152,7 @@ jobs:
150152
- *checkout
151153

152154
- name: CI script
155+
env: ${{ matrix.configuration.env_vars }}
153156
uses: ./.github/actions/run-in-docker-action
154157
with:
155158
dockerfile: ./ci/linux-debian.Dockerfile
@@ -162,6 +165,11 @@ jobs:
162165
runs-on: ubuntu-latest
163166
needs: docker_cache
164167

168+
strategy:
169+
matrix:
170+
configuration:
171+
- env_vars: {}
172+
165173
env:
166174
WRAPPER_CMD: 'qemu-s390x'
167175
SECP256K1_TEST_ITERS: 16
@@ -179,6 +187,7 @@ jobs:
179187
- *checkout
180188

181189
- name: CI script
190+
env: ${{ matrix.configuration.env_vars }}
182191
uses: ./.github/actions/run-in-docker-action
183192
with:
184193
dockerfile: ./ci/linux-debian.Dockerfile
@@ -265,6 +274,11 @@ jobs:
265274
runs-on: ubuntu-latest
266275
needs: docker_cache
267276

277+
strategy:
278+
matrix:
279+
configuration:
280+
- env_vars: {}
281+
268282
env:
269283
WRAPPER_CMD: 'qemu-ppc64le'
270284
SECP256K1_TEST_ITERS: 16
@@ -282,6 +296,7 @@ jobs:
282296
- *checkout
283297

284298
- name: CI script
299+
env: ${{ matrix.configuration.env_vars }}
285300
uses: ./.github/actions/run-in-docker-action
286301
with:
287302
dockerfile: ./ci/linux-debian.Dockerfile
@@ -649,6 +664,11 @@ jobs:
649664
runs-on: ubuntu-latest
650665
needs: docker_cache
651666

667+
strategy:
668+
matrix:
669+
configuration:
670+
- env_vars: {}
671+
652672
env:
653673
CC: 'g++'
654674
CFLAGS: '-fpermissive -g'
@@ -665,6 +685,7 @@ jobs:
665685
- *checkout
666686

667687
- name: CI script
688+
env: ${{ matrix.configuration.env_vars }}
668689
uses: ./.github/actions/run-in-docker-action
669690
with:
670691
dockerfile: ./ci/linux-debian.Dockerfile

0 commit comments

Comments
 (0)