From 93c896e3b2e851d37e77f12a23bd5310ff6b3ac8 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 11 Oct 2024 15:20:02 +0900 Subject: [PATCH] Bump macos-14 runner with macos-15 but keeps macos-13 for free intel --- .github/workflows/ci-go.yml | 2 +- .github/workflows/ci-nix.yml | 2 +- cmd/gen_matrix/main.go | 6 +++--- darwin/README.md | 2 +- flake.nix | 6 ++++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml index c8cf6e93..255d62cd 100644 --- a/.github/workflows/ci-go.yml +++ b/.github/workflows/ci-go.yml @@ -27,7 +27,7 @@ jobs: matrix: os: - ubuntu-24.04 - - macos-14 # M1. Doesn't match for my Intel Mac, but preferring with the speed. + - macos-15 # Apple Silicon. Doesn't match for my Intel Mac, but preferring with the speed. - windows-latest runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/ci-nix.yml b/.github/workflows/ci-nix.yml index f78e7987..3d40f413 100644 --- a/.github/workflows/ci-nix.yml +++ b/.github/workflows/ci-nix.yml @@ -27,7 +27,7 @@ jobs: matrix: os: - ubuntu-24.04 - - macos-14 # M1. Doesn't match for my Intel Mac, but preferring with the speed. + - macos-15 # Apple Silicon. Doesn't match for my Intel Mac, but preferring with the speed. runs-on: ${{ matrix.os }} timeout-minutes: 30 steps: diff --git a/cmd/gen_matrix/main.go b/cmd/gen_matrix/main.go index 65961e51..197fa4ca 100644 --- a/cmd/gen_matrix/main.go +++ b/cmd/gen_matrix/main.go @@ -24,11 +24,11 @@ func main() { } matrix := Matrix{ - // https://github.com/actions/runner-images/issues/9741#issuecomment-2075259811 + // https://github.com/actions/runner-images/issues/9741#issuecomment-2075259811 Os: []string{ "ubuntu-24.04", - // M1. Doesn't match for my Intel Mac, but preferring with the speed. - "macos-14", + // Apple Silicon. Doesn't match for my Intel Mac, but preferring with the speed. + "macos-15", }, } diff --git a/darwin/README.md b/darwin/README.md index 8a153265..76343e1e 100644 --- a/darwin/README.md +++ b/darwin/README.md @@ -13,4 +13,4 @@ So you should manually install followings. ## Limitations - I only have x86-64 macbook pro, it is much slow in GitHub action macos-13 runner.\ - So preferring macos-14 runner in several place... + So preferring macos-15 runner in several place... diff --git a/flake.nix b/flake.nix index a9768bdc..18401709 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,9 @@ forAllSystems = nixpkgs.lib.genAttrs [ "x86_64-linux" "x86_64-darwin" - # I don't have M1+ mac, providing this for macos-14 free runner https://github.com/actions/runner-images/issues/9741 + # I don't have Apple Silicon machines, providing this for macos-15 free runner + # - https://github.com/actions/runner-images/issues/9741 + # - https://github.com/actions/runner-images/issues/10686 "aarch64-darwin" ]; @@ -257,7 +259,7 @@ } ); - "github-actions@macos-14" = home-manager.lib.homeManagerConfiguration ( + "github-actions@macos-15" = home-manager.lib.homeManagerConfiguration ( aarch64-macOS // { # Prefer "kachick" over "common" only here.