Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump macos-14 runner with macos-15 but keeps macos-13 for free intel #837

Merged
merged 1 commit into from
Oct 11, 2024
+10 −8
Merged

Bump macos-14 runner with macos-15 but keeps macos-13 for free intel #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-nix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions cmd/gen_matrix/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}

Expand Down
2 changes: 1 addition & 1 deletion darwin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...
6 changes: 4 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
];

Expand Down Expand Up @@ -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.
Expand Down