fix: ci fixes

.gitlab-ci.yml

@@ -67,9 +67,7 @@ check:nix-dry:
   needs: []
   script:
     - >
-      nix develop .#ci --command bash -c $'
-      nix build --dry-run .#docker;
-      '
+      nix build .#docker --dry-run
   rules:
     # Runs on feature and staging commits and ignores version commits
     - if: $CI_COMMIT_BRANCH =~ /^(?:feature.*|staging)$/ && $CI_COMMIT_TITLE !~ /^[0-9]+\.[0-9]+\.[0-9]+(?:-.*[0-9]+)?$/

README.md

@@ -101,12 +101,8 @@ nix profile install github:MatrixAI/Polykey-CLI
 Install into Docker:
 
 ```sh
-docker load < result
-docker run -it "$image"
-
-loaded="$(docker load --input "$(nix-build ./release.nix --attr docker --argstr npmDepsHash "$(prefetch-npm-deps ./package-lock.json)")")"
-image="$(cut -d' ' -f3 <<< "$loaded")"
-docker run -it "$image"
+nix build .#docker
+docker load < result | cut -d' ' -f3 | xargs docker run -i
 ```
 
 ## Development

flake.nix

@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs";
+    nixpkgs.url = "github:NixOS/nixpkgs?rev=ea5234e7073d5f44728c499192544a84244bf35a";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
@@ -44,9 +44,7 @@
         dockerImage = pkgs.dockerTools.buildImage {
           name = polykey_cli.name;
           copyToRoot = [ polykey_cli ];
-          # This ensures symlinks to directories are preserved in the image
           keepContentsDirlinks = true;
-          # This adds a correct timestamp, however breaks binary reproducibility
           created = "now";
           extraCommands = ''
             mkdir -m 1777 tmp
@@ -60,7 +58,6 @@
         shell = { ci ? false }: with pkgs; pkgs.mkShell {
           nativeBuildInputs = [
             nodejs
-            prefetch-npm-deps
             shellcheck
             gitAndTools.gh
             gitAndTools.git
@@ -87,7 +84,6 @@
             }
             mkdir --parents "$(pwd)/tmp"
 
-            # Built executables and NPM executables
             export PATH="$(pwd)/dist/bin:$(npm root)/.bin:$PATH"
 
             npm install --ignore-scripts

scripts/check-test-generate.sh

@@ -70,7 +70,7 @@ check:test $test_dir:
   needs: []
   script:
     - >
-      nix-shell --arg ci true --run $'
+      nix develop .#ci --command bash -c $'
       npm test -- --ci --coverage ${test_files[@]};
       '
   artifacts:
@@ -94,7 +94,7 @@ check:test index:
   needs: []
   script:
     - >
-      nix-shell --arg ci true --run $'
+      nix develop .#ci --command bash -c $'
       npm test -- --ci --coverage ${test_files[@]};
       '
   artifacts:

scripts/npmDepsHash.sh

@@ -2,4 +2,4 @@
 
 newHash=$(nix-shell -p prefetch-npm-deps --run "prefetch-npm-deps ./package-lock.json")
 
-echo $newHash > ./npmDepsHash
+echo "$newHash" > ./npmDepsHash