refactor(ci): build on macOS 12 instead of 10.15

GitHub is deprecating their macOS 10.15 VMs [1]. Switch to the latest supported version of macOS (12) for builds. [1] actions/runner-images#5583
quick-lint · Jul 1, 2022 · ef7b244 · ef7b244
1 parent d91f5f9
commit ef7b244
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-and-test-plugin-vscode.yml b/.github/workflows/build-and-test-plugin-vscode.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - {runs_on: macos-10.15, name: "macOS x86_64", platform_arch: "darwin-x64", test: true, CC: /usr/local/opt/llvm@13/bin/clang, CXX: /usr/local/opt/llvm@13/bin/clang++, CFLAGS: "-isystem /usr/local/opt/llvm@13/include -isystem /usr/local/opt/llvm@13/include/c++/v1 -mmacosx-version-min=10.9 -D_LIBCPP_DISABLE_AVAILABILITY", LDFLAGS: "-L/usr/local/opt/llvm@13/lib -mlinker-version=278 -nostdlib++ /usr/local/opt/llvm@13/lib/libc++.a /usr/local/opt/llvm@13/lib/libc++abi.a"}
+          - {runs_on: macos-12, name: "macOS x86_64", platform_arch: "darwin-x64", test: true, CC: /usr/local/opt/llvm@13/bin/clang, CXX: /usr/local/opt/llvm@13/bin/clang++, CFLAGS: "-isystem /usr/local/opt/llvm@13/include -isystem /usr/local/opt/llvm@13/include/c++/v1 -mmacosx-version-min=10.9 -D_LIBCPP_DISABLE_AVAILABILITY", LDFLAGS: "-L/usr/local/opt/llvm@13/lib -mlinker-version=278 -nostdlib++ /usr/local/opt/llvm@13/lib/libc++.a /usr/local/opt/llvm@13/lib/libc++abi.a"}
           - {runs_on: stracle-macos-aarch64, name: "macOS AArch64", platform_arch: "darwin-arm64", test: true, CFLAGS: "-mmacosx-version-min=11.0"}
             # NOTE(strager): We test on Linux x86_64 in the build-extension job.
           - {runs_on: ubuntu-latest, name: "Linux x86_64", platform_arch: "linux-x64", test: false, docker_container: "ghcr.io/quick-lint/quick-lint-js-github-builder:v1", CC: gcc-8, CXX: g++-8, LDFLAGS: "-static-libgcc -static-libstdc++"}

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         toolchain:
-          - {runs_on: macos-10.15, name: "macOS Clang", CC: clang, CXX: clang++, CFLAGS: "", CMAKE_BUILD_TYPE: "Debug", WARNINGS: "-Werror;{1}"}
+          - {runs_on: macos-12, name: "macOS Clang", CC: clang, CXX: clang++, CFLAGS: "", CMAKE_BUILD_TYPE: "Debug", WARNINGS: "-Werror;{1}"}
           - {runs_on: ubuntu-latest, name: "Clang 9 libc++", CC: clang-9, CXX: clang++-9, CFLAGS: "-stdlib=libc++", CMAKE_BUILD_TYPE: "Debug", WARNINGS: "-Werror;{1}"}
           - {runs_on: ubuntu-latest, name: "Clang 9 libstdc++", CC: clang-9, CXX: clang++-9, CFLAGS: "-stdlib=libstdc++", CMAKE_BUILD_TYPE: "Debug", WARNINGS: "-Werror;{1}"}
           - {runs_on: ubuntu-latest, name: "Clang 9 ASAN+UBSAN libstdc++", CC: clang-9, CXX: clang++-9, CFLAGS: "-fsanitize=address,undefined -fno-sanitize-recover=address,undefined -stdlib=libstdc++", CMAKE_BUILD_TYPE: "Debug", WARNINGS: "-Werror;{1}"}

diff --git a/.github/workflows/build-static.yml b/.github/workflows/build-static.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         toolchain:
-          - {runs_on: macos-10.15, name: "macOS x86_64", archive_name: "macos", archive_extension: ".tar.gz", test: true, CC: /usr/local/opt/llvm@13/bin/clang, CXX: /usr/local/opt/llvm@13/bin/clang++, CFLAGS: "-isystem /usr/local/opt/llvm@13/include -isystem /usr/local/opt/llvm@13/include/c++/v1 -mmacosx-version-min=10.9 -D_LIBCPP_DISABLE_AVAILABILITY", LDFLAGS: "-L/usr/local/opt/llvm@13/lib -mlinker-version=278 -nostdlib++ /usr/local/opt/llvm@13/lib/libc++.a /usr/local/opt/llvm@13/lib/libc++abi.a"}
+          - {runs_on: macos-12, name: "macOS x86_64", archive_name: "macos", archive_extension: ".tar.gz", test: true, CC: /usr/local/opt/llvm@13/bin/clang, CXX: /usr/local/opt/llvm@13/bin/clang++, CFLAGS: "-isystem /usr/local/opt/llvm@13/include -isystem /usr/local/opt/llvm@13/include/c++/v1 -mmacosx-version-min=10.9 -D_LIBCPP_DISABLE_AVAILABILITY", LDFLAGS: "-L/usr/local/opt/llvm@13/lib -mlinker-version=278 -nostdlib++ /usr/local/opt/llvm@13/lib/libc++.a /usr/local/opt/llvm@13/lib/libc++abi.a"}
           - {runs_on: stracle-macos-aarch64, name: "macOS AArch64", archive_name: "macos-aarch64", archive_extension: ".tar.gz", test: true, CFLAGS: "-mmacosx-version-min=11.0"}
           - {runs_on: ubuntu-latest, name: "Linux x86_64", archive_name: "linux", archive_extension: ".tar.gz", docker_container: "ghcr.io/quick-lint/quick-lint-js-github-builder:v1", test: true, CC: gcc-8, CXX: g++-8, LDFLAGS: "-static-libgcc -static-libstdc++"}
           - {runs_on: ubuntu-latest, name: "Linux ARM", archive_name: "linux-armhf", archive_extension: ".tar.gz", docker_container: "ghcr.io/quick-lint/quick-lint-js-github-cross-builder:v2", test: false, CMAKE_FLAGS: "-DCMAKE_TOOLCHAIN_FILE=.github/toolchain-linux-armhf.cmake -G Ninja", LDFLAGS: "-static-libgcc -static-libstdc++"}

diff --git a/.github/workflows/simple-build.yml b/.github/workflows/simple-build.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         toolchain:
-          - {runs_on: macos-10.15, name: "macOS Clang", CXX: clang++, CXXFLAGS: "-std=gnu++17 -O2"}
+          - {runs_on: macos-12, name: "macOS Clang", CXX: clang++, CXXFLAGS: "-std=gnu++17 -O2"}
           - {runs_on: ubuntu-18.04, name: "Linux Clang 9 libc++", CXX: clang++-9, CXXFLAGS: "-std=gnu++17 -stdlib=libc++ -O2"}
           - {runs_on: ubuntu-latest, name: "Linux Clang 9 libstdc++", CXX: clang++-9, CXXFLAGS: "-std=gnu++17 -stdlib=libstdc++ -O2"}
           - {runs_on: ubuntu-latest, name: "Linux GCC 8", CXX: g++-8, CXXFLAGS: "-std=gnu++17 -O2"}