fix: add nightly outputs and fix errors

Author: tgunnoe

.github/workflows/ci.yml

@@ -93,7 +93,8 @@ jobs:
       - name: Build and push docker image
         run: |
           nix run .#oci-image.copyToDockerDaemon
-          docker tag partner-chains-node:latest ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:${{ github.sha }}
+          SOURCE_IMAGE=$(docker images --filter "reference=partner-chains-demo-node" --format "{{.Repository}}:{{.Tag}}" | head -1)
+          docker tag "$SOURCE_IMAGE" ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:${{ github.sha }}
           docker push ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:${{ github.sha }}
 
       - name: Upload partner-chains-node artifact
@@ -136,17 +137,13 @@ jobs:
         uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Build (Nightly)
-        env:
-          WASM_BUILD_WORKSPACE_HINT: ${{ github.workspace }}
-        run: nix develop --accept-flake-config -c bash -c "RUSTUP_TOOLCHAIN=nightly cargo build --locked --release"
+        run: nix build .#partner-chains-demo-node-nightly --print-build-logs
 
       - name: Test (Nightly)
-        env:
-          WASM_BUILD_WORKSPACE_HINT: ${{ github.workspace }}
-        run: nix develop --accept-flake-config -c bash -c "RUSTUP_TOOLCHAIN=nightly cargo test --locked --release --all-features"
+        run: nix build .#checks.x86_64-linux.cargoTestNightly --print-build-logs
 
       - name: Lint (Nightly)
-        run: nix develop --accept-flake-config -c bash -c "RUSTUP_TOOLCHAIN=nightly RUSTFLAGS=-Dwarnings cargo clippy --locked --all-features"
+        run: nix build .#checks.x86_64-linux.cargoClippyNightly --print-build-logs
 
   local-env:
     if: github.event_name == 'pull_request' && github.event.pull_request.merged == false
@@ -290,9 +287,10 @@ jobs:
       - name: Build and push docker image
         run: |
           nix run .#oci-image.copyToDockerDaemon
-          docker tag partner-chains-node:latest ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:${{ steps.get_sha.outputs.sha }}
-          docker tag partner-chains-node:latest ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:latest
-          docker tag partner-chains-node:latest ghcr.io/${{ github.repository }}/partner-chains-node-unstable:latest
+          SOURCE_IMAGE=$(docker images --filter "reference=partner-chains-demo-node" --format "{{.Repository}}:{{.Tag}}" | head -1)
+          docker tag "$SOURCE_IMAGE" ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:${{ steps.get_sha.outputs.sha }}
+          docker tag "$SOURCE_IMAGE" ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:latest
+          docker tag "$SOURCE_IMAGE" ghcr.io/${{ github.repository }}/partner-chains-node-unstable:latest
           docker push ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:${{ steps.get_sha.outputs.sha }}
           docker push ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:latest
           docker push ghcr.io/${{ github.repository }}/partner-chains-node-unstable:latest
@@ -528,7 +526,8 @@ jobs:
       - name: Build and push docker image
         run: |
           nix run .#oci-image.copyToDockerDaemon
-          docker tag partner-chains-node:latest ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:${{ inputs.sha }}
+          SOURCE_IMAGE=$(docker images --filter "reference=partner-chains-demo-node" --format "{{.Repository}}:{{.Tag}}" | head -1)
+          docker tag "$SOURCE_IMAGE" ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:${{ inputs.sha }}
           docker push ${{ secrets.ECR_REGISTRY_SECRET }}/partner-chains-node:${{ inputs.sha }}
 
       - name: Rename and prepare artifact for workflow dispatch

flake.lock

@@ -32,7 +32,10 @@
           sha256 = "SJwZ8g0zF2WrKDVmHrVG3pD2RGoQeo24MEXnNx5FyuI=";
         };
 
+        rustToolchainNightly = fenix.packages.${system}.complete.toolchain;
+
         craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
+        craneLibNightly = (crane.mkLib pkgs).overrideToolchain rustToolchainNightly;
 
         shellEnv = {
           CC_ENABLE_DEBUG_OUTPUT = "1";
@@ -147,6 +150,43 @@
           inherit (commonArgs) pname src;
         };
 
+        # Nightly builds
+        cargoVendorDirNightly = craneLibNightly.vendorCargoDeps {
+          inherit (commonArgs) src;
+          overrideVendorGitCheckout = let
+            isPolkadotSdk = p: pkgs.lib.hasPrefix "git+https://github.com/paritytech/polkadot-sdk.git" p.source;
+          in ps: drv:
+            if pkgs.lib.any (p: isPolkadotSdk p) ps then
+              drv.overrideAttrs {
+                postPatch = ''
+                  rm -rf substrate/frame/contracts/fixtures/build || true
+                  rm -rf substrate/frame/contracts/fixtures/contracts/common || true
+                  rm -rf substrate/primitives/state-machine/fuzz || true
+                '';
+              }
+            else
+              drv;
+        };
+
+        cargoArtifactsNightly = craneLibNightly.buildDepsOnly (commonArgs // {
+          cargoVendorDir = cargoVendorDirNightly;
+        });
+
+        partner-chains-demo-node-nightly = craneLibNightly.buildPackage (commonArgs // {
+          pname = "partner-chains-demo-node-nightly";
+          version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).workspace.package.version;
+          cargoArtifacts = cargoArtifactsNightly;
+          SUBSTRATE_CLI_GIT_COMMIT_HASH = "dev";
+        });
+
+        cargoTestNightly = craneLibNightly.cargoTest (commonArgs // {
+          cargoArtifacts = cargoArtifactsNightly;
+        });
+
+        cargoClippyNightly = craneLibNightly.cargoClippy (commonArgs // {
+          cargoArtifacts = cargoArtifactsNightly;
+        });
+
         devShell = craneLib.devShell ({
           name = "partner-chains-demo-node-shell";
           # Inherit inputs from other build artifacts
@@ -186,10 +226,11 @@
         checks = {
           # Build the crate as part of `nix flake check'
           inherit partner-chains-demo-node cargoTest cargoFmt devShell;
+          inherit partner-chains-demo-node-nightly cargoTestNightly cargoClippyNightly;
         };
 
         packages = {
-          inherit partner-chains-demo-node;
+          inherit partner-chains-demo-node partner-chains-demo-node-nightly;
           default = partner-chains-demo-node;
           oci-image = n2c.packages.${system}.nix2container.buildImage {
             name = "partner-chains-demo-node";