Skip to content

Commit

Permalink
ci(ch-actions): Replace FlyCI runners with GitHub runners
Browse files Browse the repository at this point in the history
  • Loading branch information
tsonev7 authored and PetarKirov committed Aug 21, 2024
1 parent 44dd385 commit fcfbc72
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions lib/mk-gh-actions-matrix.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
{ lib, self, ... }:
rec {
# See https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
# See https://www.flyci.net/#pricing
nixSystemToGHPlatform = {
# GH-hosted runners:
"x86_64-linux" = "ubuntu-latest";
# "x86_64-darwin" = "macos-13"; - macos-13 is a 4 x86_64 vCPU / 14GB RAM
# "x86_64-darwin" = "macos-14"; # - macos-14 is a 3 aarch64 vCPU / 7GB RAM (but it seems faster than the macos-13 one)
# "aarch64-darwin" = "macos-14";

# FlyCI-hosted runners:
"x86_64-darwin" = "flyci-macos-large-latest-m1";
"aarch64-darwin" = "flyci-macos-large-latest-m1";
"x86_64-darwin" = "macos-13";
"aarch64-darwin" = "macos-latest";
};

inherit (import ./build-status.nix { inherit lib; }) getBuildStatus;
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ eval_packages_to_json() {
| {
"x86_64-linux": "ubuntu-latest",
"x86_64-darwin": "macos-13",
"aarch64-darwin": "flyci-macos-large-latest-m1"
"aarch64-darwin": "macos-latest"
} as $system_to_gh_platform
| $nix_eval_results
| map({
Expand Down

0 comments on commit fcfbc72

Please sign in to comment.