From 19d09d7cdad7a5177915cf79f1a4f4e55c68f8f5 Mon Sep 17 00:00:00 2001
From: Sophie Dankel <47993817+sdankel@users.noreply.github.com>
Date: Tue, 13 Feb 2024 17:57:45 -0800
Subject: [PATCH 1/2] Use macos-latest-xlarge instead of self-hosted runners

---
 .github/workflows/refresh-manifests.yml | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/.github/workflows/refresh-manifests.yml b/.github/workflows/refresh-manifests.yml
index 948a3bad..9759e5c5 100644
--- a/.github/workflows/refresh-manifests.yml
+++ b/.github/workflows/refresh-manifests.yml
@@ -43,7 +43,7 @@ jobs:
             fuel-beta-4,
             fuel-nightly,
           ]
-        os: [ubuntu-latest, macos-latest, macos-arm]
+        os: [ubuntu-latest, macos-latest, macos-latest-xlarge]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -54,25 +54,6 @@ jobs:
           path: manifests/
       - name: stage manifests for nix build
         run: git add -v manifests
-      # Since the self-hosted runners already have nix and cachix installed, we skip these steps.
-      - if: matrix.os != 'macos-arm'
-        uses: cachix/install-nix-action@v22
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - if: matrix.os != 'macos-arm'
-        uses: cachix/cachix-action@v12
-        with:
-          name: fuellabs
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      # Copy the nix store to a tmp directory for later comparison.
-      - if: matrix.os == 'macos-arm'
-        run: ./script/list-nix-store.sh > /tmp/store-path-pre-build
-      - run: nix build --print-build-logs --no-update-lock-file .#${{ matrix.package }}
-      # Since we skipped the cachix action, we must manually update the cachix cache.
-      - if: matrix.os == 'macos-arm'
-        env:
-          CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
-        run: ./script/cachix-push-paths.sh
 
   download-manifests-and-commit:
     needs: [refresh-and-upload-manifests, download-manifests-and-nix-build]

From 25d03c3e6ba425afc0ea2fe3e399635a850f93e0 Mon Sep 17 00:00:00 2001
From: Sophie <sophiedankel@gmail.com>
Date: Tue, 13 Feb 2024 18:02:13 -0800
Subject: [PATCH 2/2] ci.yml

---
 .github/workflows/ci.yml                | 26 ++++++-------------------
 .github/workflows/refresh-manifests.yml | 18 +++++++++--------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2e2ff677..f10f4d2f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,44 +36,30 @@ jobs:
             fuel-nightly,
             sway-vim,
           ]
-        os: [ubuntu-latest, macos-latest, macos-arm]
+        os: [ubuntu-latest, macos-latest, macos-latest-xlarge]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2.4.0
-      # Since the self-hosted runners already have nix and cachix installed, we skip these steps.
-      - if: matrix.os != 'macos-arm'
-        uses: cachix/install-nix-action@v22
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - if: matrix.os != 'macos-arm'
-        uses: cachix/cachix-action@v12
+      - uses: cachix/cachix-action@v12
         with:
           name: fuellabs
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      # Copy the nix store to a tmp directory for later comparison.
-      - if: matrix.os == 'macos-arm'
-        run: ./script/list-nix-store.sh > /tmp/store-path-pre-build
-      - run: nix build --print-build-logs --no-update-lock-file .#${{ matrix.package }}
-      # Since we skipped the cachix action, we must manually update the cachix cache.
-      - if: matrix.os == 'macos-arm'
-        env:
-          CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
-        run: ./script/cachix-push-paths.sh
 
   nix-develop:
     needs: nix-build
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, macos-arm]
+        os: [ubuntu-latest, macos-latest, macos-latest-xlarge]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2.4.0
-      - if: matrix.os != 'macos-arm'
-        uses: cachix/install-nix-action@v22
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - if: matrix.os != 'macos-arm'
-        uses: cachix/cachix-action@v12
+      - uses: cachix/cachix-action@v12
         with:
           name: fuellabs
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
diff --git a/.github/workflows/refresh-manifests.yml b/.github/workflows/refresh-manifests.yml
index 9759e5c5..9cbe847f 100644
--- a/.github/workflows/refresh-manifests.yml
+++ b/.github/workflows/refresh-manifests.yml
@@ -1,4 +1,4 @@
-name: 'refresh-manifests'
+name: "refresh-manifests"
 
 on:
   schedule:
@@ -36,13 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        package:
-          [
-            fuel,
-            fuel-beta-3,
-            fuel-beta-4,
-            fuel-nightly,
-          ]
+        package: [fuel, fuel-beta-1, fuel-beta-2, fuel-beta-3, fuel-beta-4-rc, fuel-nightly]
         os: [ubuntu-latest, macos-latest, macos-latest-xlarge]
     runs-on: ${{ matrix.os }}
     steps:
@@ -54,6 +48,14 @@ jobs:
           path: manifests/
       - name: stage manifests for nix build
         run: git add -v manifests
+      - uses: cachix/install-nix-action@v22
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v12
+        with:
+          name: fuellabs
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+      - run: nix build --print-build-logs --no-update-lock-file .#${{ matrix.package }}
 
   download-manifests-and-commit:
     needs: [refresh-and-upload-manifests, download-manifests-and-nix-build]