diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef5ed2d3..b6c4419f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,6 +33,7 @@ jobs: fuel, fuel-beta-4, fuel-beta-5, + fuel-testnet, fuel-nightly, sway-vim, ] diff --git a/.github/workflows/refresh-manifests.yml b/.github/workflows/refresh-manifests.yml index 4bf88e78..0b37db5d 100644 --- a/.github/workflows/refresh-manifests.yml +++ b/.github/workflows/refresh-manifests.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - package: [fuel, fuel-beta-4, fuel-beta-5, fuel-nightly] + package: [fuel, fuel-beta-4, fuel-beta-5, fuel-testnet, fuel-nightly] os: [buildjet-4vcpu-ubuntu-2204, macos-latest, macos-latest-xlarge] runs-on: ${{ matrix.os }} steps: diff --git a/book/src/contributing/internals.md b/book/src/contributing/internals.md index 6644ef56..d69dcec1 100644 --- a/book/src/contributing/internals.md +++ b/book/src/contributing/internals.md @@ -11,7 +11,7 @@ At a very high level, **fuel.nix** does the following: provide package **sets** for the latest semver releases and nightlies e.g. (`fuel-latest`, `fuel-nightly`). 3. [**Provide a special set of "milestone" packages**](./internals/providing-milestones.html) - (e.g. `forc-wallet-beta-5`) and package sets (e.g. `fuel-beta-5`) by finding + (e.g. `forc-wallet-testnet`) and package sets (e.g. `fuel-testnet`) by finding packages that match the commits specified in `milestones.nix`. 4. **Provide `devShell`s** to assist working on the fuel repos by collecting all of the inputs to their associated packages and inheriting their environment diff --git a/book/src/packages.md b/book/src/packages.md index 5165c5a3..37d41747 100644 --- a/book/src/packages.md +++ b/book/src/packages.md @@ -35,10 +35,10 @@ nix run github:fuellabs/fuel.nix#forc-nightly Similarly, run the version of a package from a milestone with `-`, e.g. ``` -nix run github:fuellabs/fuel.nix#forc-lsp-beta-5 +nix run github:fuellabs/fuel.nix#forc-lsp-testnet ``` ``` -nix run github:fuellabs/fuel.nix#forc-wallet-beta-5 +nix run github:fuellabs/fuel.nix#forc-wallet-testnet ``` ## Temporary Shells @@ -74,9 +74,9 @@ $ exit # No fuel packages on `PATH` -$ nix shell github:fuellabs/fuel.nix#fuel-beta-5 +$ nix shell github:fuellabs/fuel.nix#fuel-testnet -# All beta-5 milestone `fuel` packages on `PATH`. +# All testnet milestone `fuel` packages on `PATH`. ``` ## Installing Packages diff --git a/book/src/quick-start.md b/book/src/quick-start.md index eaa88d83..8af9bf3c 100644 --- a/book/src/quick-start.md +++ b/book/src/quick-start.md @@ -22,11 +22,11 @@ After installing Nix, open a new terminal and install the stable Fuel toolchain in a temporary shell with the following: ```console -nix shell github:fuellabs/fuel.nix#fuel-beta-5 +nix shell github:fuellabs/fuel.nix#fuel-testnet ``` This will download the latest release of `fuel-core`, `forc`, compatible with -beta-5 network and a suite of other tools from the Fuel Labs cache into the +the testnet network and a suite of other tools from the Fuel Labs cache into the local `/nix/store` cache and "install" them to `PATH` for the duration of the current shell. @@ -34,10 +34,10 @@ Let's check installation worked: ```console $ fuel-core --version -fuel-core 0.22.0 +fuel-core 0.26.0 $ forc --version -forc 0.49.2 +forc 0.60.0 ``` > **Note:** If you have previously installed Fuel tools using `cargo`, `fuelup` @@ -59,7 +59,7 @@ were never installed. ## Diving Deeper To find out how to install tools persistently for the current user, how to -install different toolchain channels (nightly, beta-5, etc), how to install +install different toolchain channels (nightly, testnet, etc), how to install individual components, along with a whole suite of other options, see [**the Packages chapter**](./packages.html). diff --git a/milestones.nix b/milestones.nix index b0ecd549..f644ac04 100644 --- a/milestones.nix +++ b/milestones.nix @@ -20,4 +20,13 @@ fuel-core = "d134579bc4054838e8809984070076bcfac56bb7"; sway = "a70c746d27b3300beef896ccd1dcce1299836192"; }; + + # Commits sourced from: + # https://raw.githubusercontent.com/FuelLabs/fuelup/gh-pages/channel-fuel-testnet.toml + testnet = { + forc-explorer = "4bb7392eed085ee3a6795b98ea25392b3f41ade8"; + forc-wallet = "8420eb63b6c288a051831f2871a937a89b9e43bc"; + fuel-core = "9fddeccb4d112c148f6793bc3d21131a13778a25"; + sway = "2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6"; + }; }