diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 45798b6e..3874866f 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022,macos-13,macos-14] + os: [windows-2022,macos-15-intel] arch: [x64,x86,arm64,arm] cpurev: [default] steps: @@ -43,7 +43,7 @@ jobs: # But it is disabled on Github Hyper-V runners. - name: Test if: | - (matrix.os == 'macos-13' && matrix.arch != 'arm64' && matrix.arch != 'arm') + (matrix.os == 'macos-15-intel' && matrix.arch != 'arm64' && matrix.arch != 'arm') env: ANDROID_EMULATOR_WAIT_TIME_BEFORE_KILL: 10 run: make test diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index f2821c5a..7433f637 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13,macos-14] + os: [macos-14] arch: [arm64, x64] cpurev: [default] steps: diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml index 64d48ad3..b488ae68 100644 --- a/.github/workflows/build-osx.yml +++ b/.github/workflows/build-osx.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13,macos-14] + os: [macos-15,macos-15-intel] arch: [x64,arm64] cpurev: [legacy, default, modern] steps: @@ -66,10 +66,9 @@ jobs: # Test - name: Test if: | - (matrix.os == 'macos-12' && matrix.arch == 'x64') || - (matrix.os == 'macos-13' && matrix.arch == 'x64') || - (matrix.os == 'macos-14' && matrix.arch == 'arm64') || - (matrix.os == 'macos-14' && matrix.arch == 'x64' && matrix.cpurev == 'legacy') + (matrix.os == 'macos-15' && matrix.arch == 'arm64') || + (matrix.os == 'macos-15-intel' && matrix.arch == 'x64') || + (matrix.os == 'macos-15' && matrix.arch == 'x64' && matrix.cpurev == 'legacy') run: make test # Upload Binaries diff --git a/.github/workflows/build-wasi.yml b/.github/workflows/build-wasi.yml index 696ab9ae..1662cf4b 100644 --- a/.github/workflows/build-wasi.yml +++ b/.github/workflows/build-wasi.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022,ubuntu-22.04,ubuntu-24.04,macos-13,macos-14,macos-15] + os: [windows-2022,ubuntu-22.04,ubuntu-24.04,macos-14,macos-15] arch: [wasm32] sdk: [24] steps: diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml index dd527cea..becee2a9 100644 --- a/.github/workflows/build-win.yml +++ b/.github/workflows/build-win.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022,windows-2025] + os: [windows-2022,windows-2025,windows-11-arm] arch: [x64,x86,arm64] cpurev: [legacy, default, modern] steps: @@ -93,7 +93,9 @@ jobs: # Test - name: Test - if: matrix.arch == 'x64' || matrix.arch == 'x86' + if: | + ((matrix.os == 'windows-2022' || matrix.os == 'windows-2025') && (matrix.arch == 'x64' || matrix.arch == 'x86')) || + ((matrix.os == 'windows-11-arm') && (matrix.arch == 'arm64' || matrix.arch == 'x86' || (matrix.arch == 'x64' && matrix.cpurev != 'modern'))) run: make test # Upload Binaries