ci: use nix devshell

Author: robjtede

.github/workflows/ci.yml

@@ -35,15 +35,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install Nix
+        uses: cachix/install-nix-action@v27
+
+      - name: Enter Nix devshell
+        uses: nicknovitski/[email protected]
+
       - name: Install Rust (${{ matrix.toolchain.name }})
         uses: actions-rust-lang/[email protected]
         with:
           toolchain: ${{ matrix.toolchain.version }}
 
-      - name: Install just, nextest
+      - name: Install nextest
         uses: taiki-e/[email protected]
         with:
-          tool: just,nextest
+          tool: nextest
 
       - name: workaround MSRV issues
         if: matrix.toolchain.name == 'msrv'

.github/workflows/lint.yml

@@ -12,6 +12,28 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  print-msrv:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v27
+
+      - name: Enter Nix devshell
+        uses: nicknovitski/[email protected]
+
+      - name: Install Rust
+        uses: actions-rust-lang/[email protected]
+
+      - run: ls -la .toolchain
+      - run: cat .toolchain/rust.just
+      - run: just --evaluate msrv
+
   clippy:
     runs-on: ubuntu-latest
 
@@ -22,15 +44,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install Nix
+        uses: cachix/install-nix-action@v27
+
+      - name: Enter Nix devshell
+        uses: nicknovitski/[email protected]
+
       - name: Install Rust
         uses: actions-rust-lang/[email protected]
         with:
           components: clippy
 
-      - name: Install just & cargo-hack
+      - name: Install cargo-hack
         uses: taiki-e/[email protected]
         with:
-          tool: just,cargo-hack
+          tool: cargo-hack
 
       - name: Clippy
         run: just clippy

.gitignore

@@ -2,6 +2,9 @@
 /target/
 Cargo.lock
 
+# x52 toolchain
+/.toolchain/
+
 # direnv
 /.direnv/
 

flake.lock

@@ -1,15 +1,27 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    flake-parts.url = "github:hercules-ci/flake-parts";
+    x52 = {
+      url = "github:x52dev/nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
+    };
   };
 
-  outputs = inputs@{ flake-parts, ... }:
+  outputs = inputs @ { flake-parts, x52, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
-      perSystem = { pkgs, config, inputs', system, lib, ... }: {
+      perSystem = { pkgs, config, inputs', system, lib, ... }:
+      let
+        x52just = inputs'.x52.packages.x52-just;
+      in
+      {
         formatter = pkgs.nixpkgs-fmt;
 
         devShells.default = pkgs.mkShell {
+          buildInputs = [ x52just ];
+          
           packages = [
             config.formatter
             pkgs.nodePackages.prettier
@@ -21,6 +33,11 @@
             pkgs.pkgsBuildHost.darwin.apple_sdk.frameworks.CoreFoundation
             pkgs.pkgsBuildHost.darwin.apple_sdk.frameworks.SystemConfiguration
           ];
+
+          shellHook = ''
+            mkdir -p .toolchain
+            cp ${x52just}/rust.just .toolchain/
+          '';
         };
       };
     };

flake.nix

@@ -1,3 +1,5 @@
+import '.toolchain/rust.just'
+
 _list:
     @just --list
 
@@ -7,13 +9,6 @@ clippy:
     cargo clippy --workspace --no-default-features --all-features
     cargo hack --feature-powerset --depth=3 clippy --workspace
 
-msrv := ```
-    cargo metadata --format-version=1 \
-    | jq -r 'first(.packages[] | select(.source == null and .rust_version)) | .rust_version' \
-    | sed -E 's/^1\.([0-9]{2})$/1\.\1\.0/'
-```
-msrv_rustup := "+" + msrv
-
 # Downgrade dev-dependencies necessary to run MSRV checks/tests.
 [private]
 downgrade-msrv:
@@ -58,13 +53,14 @@ doc-watch:
 # Check project
 check:
     just --unstable --fmt --check
-    prettier --check $(fd --type=file --hidden --extension=md --extension=yml)
-    taplo lint $(fd --hidden --extension=toml)
+    fd --hidden --type=file --extension=md --extension=yml --exec-batch prettier --check
+    fd --hidden --extension=toml --exec-batch taplo format --check
+    fd --hidden --extension=toml --exec-batch taplo lint
     cargo +nightly fmt -- --check
 
 # Format project
 fmt:
     just --unstable --fmt
-    prettier --write $(fd --type=file --hidden --extension=md --extension=yml)
-    taplo format $(fd --hidden --extension=toml)
+    fd --hidden --type=file --extension=md --extension=yml --exec-batch prettier --write
+    fd --hidden --extension=toml --exec-batch taplo format
     cargo +nightly fmt