Skip to content

Commit

Permalink
Pass generic os name instead of build platform.
Browse files Browse the repository at this point in the history
  • Loading branch information
abeltrano committed Jun 21, 2024
1 parent a8e58e3 commit 38d13f1
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ jobs:
fail-fast: false
matrix:
config:
- { os: windows-2022 }
- { os: windows-2022, arch: 'ARM64' }
- { os: ubuntu-24.04 }
- { os: windows-2022, os-name: 'windows' }
- { os: windows-2022, os-name: 'windows', arch: 'ARM64' }
- { os: ubuntu-24.04, os-name: 'linux' }
build-type: ${{ fromJson(inputs.build-types) }}
runs-on: ${{ matrix.config.os }}

Expand All @@ -117,10 +117,10 @@ jobs:
languages: 'cpp'

- name: Build Windows
if: ${{ contains(matrix.config.os, 'windows') }}
if: ${{ contains(matrix.config.os-name, 'windows') }}
uses: ./.github/actions/build-with-host
with:
os: ${{ matrix.config.os }}
os: ${{ matrix.config.os-name }}
build-type: ${{ matrix.build-type }}
install: ${{ inputs.install }}
test: ${{ inputs.test }}
Expand All @@ -129,10 +129,10 @@ jobs:
preset-name: ${{ inputs.preset-name }}

- name: Build Linux
if: ${{ contains(matrix.config.os, 'ubuntu-24.04') }}
if: ${{ contains(matrix.config.os-name, 'linux') }}
uses: ./.github/actions/build-with-host
with:
os: ${{ matrix.config.os }}
os: ${{ matrix.config.os-name }}
build-type: ${{ matrix.build-type }}
install: ${{ inputs.install }}
test: ${{ inputs.test }}
Expand Down

0 comments on commit 38d13f1

Please sign in to comment.