From a0e4e7b3afb29daa64a6d5368fe826707341f633 Mon Sep 17 00:00:00 2001 From: Dimitar Tsonev Date: Tue, 20 Aug 2024 11:45:52 +0300 Subject: [PATCH] ci(ch-actions): Replace FlyCI runners with GitHub runners --- lib/mk-gh-actions-matrix.nix | 6 ++---- scripts/ci-matrix.sh | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/mk-gh-actions-matrix.nix b/lib/mk-gh-actions-matrix.nix index 38e7238f..373cbb9c 100644 --- a/lib/mk-gh-actions-matrix.nix +++ b/lib/mk-gh-actions-matrix.nix @@ -1,7 +1,6 @@ { 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"; @@ -9,9 +8,8 @@ rec { # "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; diff --git a/scripts/ci-matrix.sh b/scripts/ci-matrix.sh index 37ec1fae..340cccf0 100755 --- a/scripts/ci-matrix.sh +++ b/scripts/ci-matrix.sh @@ -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({