diff --git a/.github/workflows/shared_build_release_am_extension.yml b/.github/workflows/shared_build_release_am_extension.yml index 7e797c9..3eae463 100644 --- a/.github/workflows/shared_build_release_am_extension.yml +++ b/.github/workflows/shared_build_release_am_extension.yml @@ -19,25 +19,20 @@ on: description: "The MetaMod Repository branch to compile the extension against" default: "1.12-dev" type: string + os-list: + description: 'JSON array of runner labels to build on (e.g. ["ubuntu-24.04", "windows-2022"])' + default: '["ubuntu-24.04", "windows-2022"]' + type: string jobs: build: strategy: fail-fast: false matrix: - os: - - ubuntu-24.04 - - windows-2022 + os: ${{ fromJSON(inputs.os-list) }} sm-branch: - master - 1.12-dev - include: - - os: ubuntu-24.04 - cc: clang-14 - cxx: clang++-14 - - os: windows-2022 - cc: msvc - cxx: msvc name: ${{ matrix.os }} (SM ${{ matrix.sm-branch }}) runs-on: ${{ matrix.os }} @@ -57,8 +52,8 @@ jobs: id: ambuild with: os: ${{ matrix.os }} - cc: ${{ matrix.cc }} - cxx: ${{ matrix.cxx }} + cc: ${{ startsWith(matrix.os, 'windows') && 'msvc' || 'clang-14' }} + cxx: ${{ startsWith(matrix.os, 'windows') && 'msvc' || 'clang++-14' }} ambuild-ref: 'master' mm-ref: ${{ inputs.mm-branch }} sm-ref: ${{ matrix.sm-branch }}