Bypass generate-matrix job

This commit is contained in:
Bart Thomee
2025-07-27 12:49:22 -04:00
parent b6ff27f51f
commit b869902453
2 changed files with 7 additions and 26 deletions

View File

@@ -139,29 +139,17 @@ jobs:
strategy_matrix_build_type: ${{ env.STRATEGY_MATRIX_BUILD_TYPE }}
strategy_matrix_cmake_args: ${{ env.STRATEGY_MATRIX_CMAKE_ARGS }}
# Generate the strategy matrix.
generate-matrix:
needs:
- expose-env
uses: ./.github/workflows/generate-matrix.yml
with:
architecture: ${{ needs.expose-env.outputs.strategy_matrix_architecture }}
os: ${{ needs.expose-env.outputs.strategy_matrix_os }}
build_type: ${{ needs.expose-env.outputs.strategy_matrix_build_type }}
cmake_args: ${{ needs.expose-env.outputs.strategy_matrix_cmake_args }}
# Install and cache the dependencies using various configurations.
install-dependencies:
needs:
- expose-env
- generate-matrix
uses: ./.github/workflows/install-dependencies.yml
strategy:
fail-fast: false
matrix:
architecture: ${{ fromJson(needs.generate-matrix.outputs.architecture) }}
os: ${{ fromJson(needs.generate-matrix.outputs.os) }}
build_type: ${{ fromJson(needs.generate-matrix.outputs.build_type) }}
architecture: ${{ fromJson(needs.expose-env.outputs.strategy_matrix_architecture) }}
os: ${{ fromJson(needs.expose-env.outputs.strategy_matrix_os) }}
build_type: ${{ fromJson(needs.expose-env.outputs.strategy_matrix_build_type) }}
with:
build_dir: ${{ inputs.build_dir }}
build_type: ${{ strategy.matrix.build_type }}
@@ -173,16 +161,15 @@ jobs:
build-and-test:
needs:
- expose-env
- generate-matrix
- install-dependencies
uses: ./.github/workflows/build-nix.yml
strategy:
fail-fast: false
matrix:
architecture: ${{ fromJson(needs.generate-matrix.outputs.architecture) }}
os: ${{ fromJson(needs.generate-matrix.outputs.os) }}
build_type: ${{ fromJson(needs.generate-matrix.outputs.build_type) }}
cmake_args: ${{ fromJson(needs.generate-matrix.outputs.cmake_args) }}
architecture: ${{ fromJson(needs.expose-env.outputs.strategy_matrix_architecture) }}
os: ${{ fromJson(needs.expose-env.outputs.strategy_matrix_os) }}
build_type: ${{ fromJson(needs.expose-env.outputs.strategy_matrix_build_type) }}
cmake_args: ${{ fromJson(needs.expose-env.outputs.strategy_matrix_cmake_args) }}
with:
build_dir: ${{ inputs.build_dir }}
build_type: ${{ strategy.matrix.build_type }}

View File

@@ -59,12 +59,6 @@ jobs:
echo "os=$(jq -c <<< '${{ inputs.os }}')" >> "$GITHUB_OUTPUT"
echo "build_type=$(jq -c <<< '${{ inputs.build_type }}')" >> "$GITHUB_OUTPUT"
echo "cmake_args=$(jq -c <<< '${{ inputs.cmake_args }}')" >> "$GITHUB_OUTPUT"
- name: Print outputs
run: |
echo "Architecture: ${{ fromJson(steps.generate.outputs.architecture) }}"
echo "OS: ${{ fromJson(steps.generate.outputs.os) }}"
echo "Build Type: ${{ fromJson(steps.generate.outputs.build_type) }}"
echo "CMake Args: ${{ fromJson(steps.generate.outputs.cmake_args) }}"
outputs:
architecture: ${{ steps.generate.outputs.architecture }}
os: ${{ steps.generate.outputs.os }}