[github] Use macos-15-intel builder instead of macos-13
Also up the deployment target to macOS 12.0
Bug:
Change-Id: I07587ca23a89bfd501ce79e537d21adb2533e941
This is an imported pull request from
https://github.com/google/dawn/pull/47
GITHUB_PR_HEAD_SHA=84d3d9d3e513f053f76afe085c0a45aab360aebe
ORIGINAL_AUTHOR=Corentin Wallez <cwallez@chromium.org>
GitOrigin-RevId: 5a7670338e0fde602b053a5c5493f1e27d84f047
Change-Id: I8ef31c8feb5ae7307e5c87310441aa4c9922e323
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/265954
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Loko Kung <lokokung@google.com>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5834df2..265fe13 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@
# 7. <MacOS x64, Debug, latest Clang compiler toolchain on the default runner image, default generator>
# 8. <MacOS x64, Release, latest Clang compiler toolchain on the default runner image, default generator>
matrix:
- os: [windows-latest, ubuntu-latest, macos-latest, macos-13]
+ os: [windows-latest, ubuntu-latest, macos-latest, macos-15-intel]
build_type: [Debug, Release]
toolchain: [gcc, clang, msvc]
include:
@@ -44,14 +44,14 @@
c_compiler: clang
cpp_compiler: clang++
env:
- MACOSX_DEPLOYMENT_TARGET: "11.0"
+ MACOSX_DEPLOYMENT_TARGET: "12.0"
container: null
- - os: macos-13
+ - os: macos-15-intel
toolchain: clang
c_compiler: clang
cpp_compiler: clang++
env:
- MACOSX_DEPLOYMENT_TARGET: "11.0"
+ MACOSX_DEPLOYMENT_TARGET: "12.0"
container: null
- os: windows-latest
toolchain: msvc
@@ -70,9 +70,9 @@
toolchain: msvc
- os: macos-latest
toolchain: gcc
- - os: macos-13
+ - os: macos-15-intel
toolchain: msvc
- - os: macos-13
+ - os: macos-15-intel
toolchain: gcc
- os: ubuntu-latest
toolchain: msvc
@@ -243,7 +243,7 @@
- platform: macos
arch: universal
toolchain_file: build-tools/apple.toolchain.cmake
- cmake_args: -DPLATFORM=MAC_UNIVERSAL -DDEPLOYMENT_TARGET=11.0 -DENABLE_BITCODE=OFF -DENABLE_ARC=OFF -DENABLE_VISIBILITY=OFF
+ cmake_args: -DPLATFORM=MAC_UNIVERSAL -DDEPLOYMENT_TARGET=12.0 -DENABLE_BITCODE=OFF -DENABLE_ARC=OFF -DENABLE_VISIBILITY=OFF
output_dir: out/macos_universal
library_path: src/dawn/native/libwebgpu_dawn.a