fix: patch rust v1.81 as of >2024-12-30 (#153)

Patches the version of rust, increases the timeout for the refresh-manifests actions, and moves them to run in build-jet. As a follow up, we should adjust the script to only refresh more recent nightly builds to reduce the time it takes. --------- Co-authored-by: GitHub Action <[email protected]>
FuelLabs · Jan 7, 2025 · 03cba06 · 03cba06
1 parent 0e91606
commit 03cba06
Show file tree

Hide file tree

Showing 18 changed files with 135 additions and 13 deletions.
diff --git a/.github/workflows/patch-pr.yml b/.github/workflows/patch-pr.yml
@@ -11,7 +11,7 @@ concurrency:
 
 jobs:
   refresh-and-commit:
-    runs-on: ubuntu-latest
+    runs-on: buildjet-4vcpu-ubuntu-2204
     if: github.ref != 'refs/heads/master'
     permissions:
       # Give the default GITHUB_TOKEN write permission to commit and push the
@@ -31,7 +31,7 @@ jobs:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
       - run: nix flake update
       - run: nix run .#refresh-manifests
-        timeout-minutes: 120
+        timeout-minutes: 240
       - name: validate changed nix files
         run: |
           files=( $(git diff --name-only '*.nix') )

diff --git a/.github/workflows/refresh-manifests.yml b/.github/workflows/refresh-manifests.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   refresh-and-upload-manifests:
-    runs-on: ubuntu-latest
+    runs-on: buildjet-4vcpu-ubuntu-2204
     steps:
       - uses: actions/checkout@v3
       - uses: cachix/install-nix-action@v22
@@ -18,7 +18,7 @@ jobs:
           name: fuellabs
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
       - run: nix run .#refresh-manifests
-        timeout-minutes: 120
+        timeout-minutes: 240
       - name: validate changed nix files
         run: |
           files=( $(git diff --name-only '*.nix') )

diff --git a/flake.lock b/flake.lock
diff --git a/manifests/forc-0.66.5-nightly-2025-01-07.nix b/manifests/forc-0.66.5-nightly-2025-01-07.nix
@@ -0,0 +1,8 @@
+{
+  pname = "forc";
+  version = "0.66.5";
+  date = "2025-01-07";
+  url = "https://github.com/fuellabs/sway";
+  rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea";
+  sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4=";
+}
diff --git a/manifests/forc-client-0.66.5-nightly-2025-01-07.nix b/manifests/forc-client-0.66.5-nightly-2025-01-07.nix
@@ -0,0 +1,8 @@
+{
+  pname = "forc-client";
+  version = "0.66.5";
+  date = "2025-01-07";
+  url = "https://github.com/fuellabs/sway";
+  rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea";
+  sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4=";
+}
diff --git a/manifests/forc-crypto-0.66.5-nightly-2025-01-07.nix b/manifests/forc-crypto-0.66.5-nightly-2025-01-07.nix
@@ -0,0 +1,8 @@
+{
+  pname = "forc-crypto";
+  version = "0.66.5";
+  date = "2025-01-07";
+  url = "https://github.com/fuellabs/sway";
+  rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea";
+  sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4=";
+}
diff --git a/manifests/forc-debug-0.66.5-nightly-2025-01-07.nix b/manifests/forc-debug-0.66.5-nightly-2025-01-07.nix
@@ -0,0 +1,8 @@
+{
+  pname = "forc-debug";
+  version = "0.66.5";
+  date = "2025-01-07";
+  url = "https://github.com/fuellabs/sway";
+  rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea";
+  sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4=";
+}
diff --git a/manifests/forc-doc-0.66.5-nightly-2025-01-07.nix b/manifests/forc-doc-0.66.5-nightly-2025-01-07.nix
@@ -0,0 +1,8 @@
+{
+  pname = "forc-doc";
+  version = "0.66.5";
+  date = "2025-01-07";
+  url = "https://github.com/fuellabs/sway";
+  rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea";
+  sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4=";
+}
diff --git a/manifests/forc-fmt-0.66.5-nightly-2025-01-07.nix b/manifests/forc-fmt-0.66.5-nightly-2025-01-07.nix
@@ -0,0 +1,8 @@
+{
+  pname = "forc-fmt";
+  version = "0.66.5";
+  date = "2025-01-07";
+  url = "https://github.com/fuellabs/sway";
+  rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea";
+  sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4=";
+}
diff --git a/manifests/forc-lsp-0.66.5-nightly-2025-01-07.nix b/manifests/forc-lsp-0.66.5-nightly-2025-01-07.nix
@@ -0,0 +1,8 @@
+{
+  pname = "forc-lsp";
+  version = "0.66.5";
+  date = "2025-01-07";
+  url = "https://github.com/fuellabs/sway";
+  rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea";
+  sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4=";
+}
diff --git a/manifests/forc-tx-0.66.5-nightly-2025-01-07.nix b/manifests/forc-tx-0.66.5-nightly-2025-01-07.nix
@@ -0,0 +1,8 @@
+{
+  pname = "forc-tx";
+  version = "0.66.5";
+  date = "2025-01-07";
+  url = "https://github.com/fuellabs/sway";
+  rev = "8fe2bd6ed267d94e172350d0835de5a11d796cea";
+  sha256 = "sha256-AoUm642EeZxVdn5XUUlfCwQjQLuftPzPLpUmVzFhuH4=";
+}
diff --git a/manifests/fuel-core-0.40.2-nightly-2025-01-01.nix b/manifests/fuel-core-0.40.2-nightly-2025-01-01.nix
@@ -0,0 +1,8 @@
+{
+  pname = "fuel-core";
+  version = "0.40.2";
+  date = "2025-01-01";
+  url = "https://github.com/fuellabs/fuel-core";
+  rev = "df0283c2fc32cdf053ce20dfd021e5206c9c5e86";
+  sha256 = "sha256-yTQTj709y6lK6HN0pMDGWot5CcSQLDBilHlB7J0krJs=";
+}
diff --git a/manifests/fuel-core-0.40.2-nightly-2025-01-03.nix b/manifests/fuel-core-0.40.2-nightly-2025-01-03.nix
@@ -0,0 +1,8 @@
+{
+  pname = "fuel-core";
+  version = "0.40.2";
+  date = "2025-01-03";
+  url = "https://github.com/fuellabs/fuel-core";
+  rev = "d84306f9a83a4a2358ef18a5033dfb0812170a87";
+  sha256 = "sha256-xoYEyVP0pK2qBofca9gCzODfOtwZrchrzu5k1QXXBsA=";
+}
diff --git a/manifests/fuel-core-0.40.2-nightly-2025-01-07.nix b/manifests/fuel-core-0.40.2-nightly-2025-01-07.nix
@@ -0,0 +1,8 @@
+{
+  pname = "fuel-core";
+  version = "0.40.2";
+  date = "2025-01-07";
+  url = "https://github.com/fuellabs/fuel-core";
+  rev = "4f77f349ed7eba886e04ffe49c385ef635ec69b1";
+  sha256 = "sha256-tuLI2jsCyolvWB4BFCYDX6CsxBDCJR0iThZ5TUIlhtY=";
+}
diff --git a/manifests/fuel-core-client-0.40.2-nightly-2025-01-01.nix b/manifests/fuel-core-client-0.40.2-nightly-2025-01-01.nix
@@ -0,0 +1,8 @@
+{
+  pname = "fuel-core-client";
+  version = "0.40.2";
+  date = "2025-01-01";
+  url = "https://github.com/fuellabs/fuel-core";
+  rev = "df0283c2fc32cdf053ce20dfd021e5206c9c5e86";
+  sha256 = "sha256-yTQTj709y6lK6HN0pMDGWot5CcSQLDBilHlB7J0krJs=";
+}
diff --git a/manifests/fuel-core-client-0.40.2-nightly-2025-01-03.nix b/manifests/fuel-core-client-0.40.2-nightly-2025-01-03.nix
@@ -0,0 +1,8 @@
+{
+  pname = "fuel-core-client";
+  version = "0.40.2";
+  date = "2025-01-03";
+  url = "https://github.com/fuellabs/fuel-core";
+  rev = "d84306f9a83a4a2358ef18a5033dfb0812170a87";
+  sha256 = "sha256-xoYEyVP0pK2qBofca9gCzODfOtwZrchrzu5k1QXXBsA=";
+}
diff --git a/manifests/fuel-core-client-0.40.2-nightly-2025-01-07.nix b/manifests/fuel-core-client-0.40.2-nightly-2025-01-07.nix
@@ -0,0 +1,8 @@
+{
+  pname = "fuel-core-client";
+  version = "0.40.2";
+  date = "2025-01-07";
+  url = "https://github.com/fuellabs/fuel-core";
+  rev = "4f77f349ed7eba886e04ffe49c385ef635ec69b1";
+  sha256 = "sha256-tuLI2jsCyolvWB4BFCYDX6CsxBDCJR0iThZ5TUIlhtY=";
+}
diff --git a/patches.nix b/patches.nix
@@ -336,4 +336,14 @@ in [
       };
     };
   }
+
+  # `fuel-core` requires Rust 1.81 as of v0.40.2.
+  {
+    condition = m: m.date >= "2024-12-30";
+    patch = m: {
+      rust = pkgs.rust-bin.stable."1.81.0".default.override {
+        targets = ["wasm32-unknown-unknown"];
+      };
+    };
+  }
 ]