ci, refactor: Generalize use of matrix.configuration.env_vars

This commit is contained in:
Hennadii Stepanov
2025-10-14 12:23:54 +01:00
parent 4b644da199
commit dff1bc107d

View File

@@ -130,6 +130,8 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
configuration:
- env_vars: {}
cc: cc:
- 'i686-linux-gnu-gcc' - 'i686-linux-gnu-gcc'
- 'clang --target=i686-pc-linux-gnu -isystem /usr/i686-linux-gnu/include' - 'clang --target=i686-pc-linux-gnu -isystem /usr/i686-linux-gnu/include'
@@ -148,6 +150,7 @@ jobs:
- *CHECKOUT - *CHECKOUT
- name: CI script - name: CI script
env: ${{ matrix.configuration.env_vars }}
uses: ./.github/actions/run-in-docker-action uses: ./.github/actions/run-in-docker-action
with: with:
dockerfile: ./ci/linux-debian.Dockerfile dockerfile: ./ci/linux-debian.Dockerfile
@@ -159,6 +162,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: docker_cache needs: docker_cache
strategy:
matrix:
configuration:
- env_vars: {}
env: env:
WRAPPER_CMD: 'qemu-s390x' WRAPPER_CMD: 'qemu-s390x'
SECP256K1_TEST_ITERS: 16 SECP256K1_TEST_ITERS: 16
@@ -176,6 +184,7 @@ jobs:
- *CHECKOUT - *CHECKOUT
- name: CI script - name: CI script
env: ${{ matrix.configuration.env_vars }}
uses: ./.github/actions/run-in-docker-action uses: ./.github/actions/run-in-docker-action
with: with:
dockerfile: ./ci/linux-debian.Dockerfile dockerfile: ./ci/linux-debian.Dockerfile
@@ -238,6 +247,8 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
configuration:
- env_vars: {}
cc: cc:
- 'gcc' - 'gcc'
- 'clang' - 'clang'
@@ -248,6 +259,7 @@ jobs:
- *CHECKOUT - *CHECKOUT
- name: CI script - name: CI script
env: ${{ matrix.configuration.env_vars }}
uses: ./.github/actions/run-in-docker-action uses: ./.github/actions/run-in-docker-action
with: with:
dockerfile: ./ci/linux-debian.Dockerfile dockerfile: ./ci/linux-debian.Dockerfile
@@ -259,6 +271,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: docker_cache needs: docker_cache
strategy:
matrix:
configuration:
- env_vars: {}
env: env:
WRAPPER_CMD: 'qemu-ppc64le' WRAPPER_CMD: 'qemu-ppc64le'
SECP256K1_TEST_ITERS: 16 SECP256K1_TEST_ITERS: 16
@@ -276,6 +293,7 @@ jobs:
- *CHECKOUT - *CHECKOUT
- name: CI script - name: CI script
env: ${{ matrix.configuration.env_vars }}
uses: ./.github/actions/run-in-docker-action uses: ./.github/actions/run-in-docker-action
with: with:
dockerfile: ./ci/linux-debian.Dockerfile dockerfile: ./ci/linux-debian.Dockerfile
@@ -283,14 +301,14 @@ jobs:
- *PRINT_LOGS - *PRINT_LOGS
valgrind_debian: valgrind_debian:
name: "Valgrind ${{ matrix.binary_arch }} (memcheck)" name: "Valgrind ${{ matrix.configuration.binary_arch }} (memcheck)"
runs-on: ${{ matrix.runner }} runs-on: ${{ matrix.configuration.runner }}
needs: docker_cache needs: docker_cache
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
include: configuration:
- runner: ubuntu-latest - runner: ubuntu-latest
binary_arch: x64 binary_arch: x64
env_vars: { CC: 'clang', ASM: 'auto' } env_vars: { CC: 'clang', ASM: 'auto' }
@@ -327,7 +345,7 @@ jobs:
- *CHECKOUT - *CHECKOUT
- name: CI script - name: CI script
env: ${{ matrix.env_vars }} env: ${{ matrix.configuration.env_vars }}
uses: ./.github/actions/run-in-docker-action uses: ./.github/actions/run-in-docker-action
with: with:
dockerfile: ./ci/linux-debian.Dockerfile dockerfile: ./ci/linux-debian.Dockerfile
@@ -640,6 +658,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: docker_cache needs: docker_cache
strategy:
matrix:
configuration:
- env_vars: {}
env: env:
CC: 'g++' CC: 'g++'
CFLAGS: '-fpermissive -g' CFLAGS: '-fpermissive -g'
@@ -656,6 +679,7 @@ jobs:
- *CHECKOUT - *CHECKOUT
- name: CI script - name: CI script
env: ${{ matrix.configuration.env_vars }}
uses: ./.github/actions/run-in-docker-action uses: ./.github/actions/run-in-docker-action
with: with:
dockerfile: ./ci/linux-debian.Dockerfile dockerfile: ./ci/linux-debian.Dockerfile