feat: Nix indirect flake input

- this also fixes a race condition with the CI lock file changes
MatrixAI · Sep 6, 2024 · 358955e · 358955e
1 parent a031b1b
commit 358955e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Dry run
-        run: nix build .#docker --dry-run
+        run: nix build .#docker --dry-run --no-update-lock-file --no-write-lock-file
 
   check-build:
     name: "Check / Build"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Dry run
-        run: nix build .#docker --dry-run --no-update-lock-file
+        run: nix build .#docker --dry-run --no-update-lock-file --no-write-lock-file
 
   check-build:
     name: "Check / Build"
@@ -139,6 +139,8 @@ jobs:
             --max-jobs "$(nproc)" \
             --cores "$(nproc)" \
             --print-out-paths \
+            --no-update-lock-file \
+            --no-write-lock-file \
             .# \
           )"
           nix-store --export $( \
@@ -149,12 +151,14 @@ jobs:
             --cores "$(nproc)" \
             --print-out-paths \
             --print-build-logs \
+            --no-update-lock-file \
+            --no-write-lock-file \
             .# \
             .#docker \
             .#packages.x86_64-linux.executable \
           )"
           cp -r $(echo $builds | tr '\n' ' ') ./builds/
-          nix develop .#ci --command bash -c $'
+          nix develop --no-update-lock-file --no-write-lock-file .#ci --command bash -c $'
           npm run build
           '
       - uses: actions/upload-artifact@v4
@@ -196,7 +200,7 @@ jobs:
             script: |
               docker info
               mkdir $PK_TEST_TMPDIR
-              nix develop .#ci --command bash -c $'
+              nix develop --no-update-lock-file --no-write-lock-file .#ci --command bash -c $'
               image_and_tag="$(docker load --input ./builds/*docker* | cut -d\' \' -f3)"
               docker tag "$image_and_tag" "polykey-cli:testtarget"
               '
@@ -330,7 +334,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           CI_REGISTRY_IMAGE: '015248367786.dkr.ecr.ap-southeast-2.amazonaws.com/polykey'
         run: |
-          nix develop .#ci --command bash -c $'
+          nix develop --no-update-lock-file --no-write-lock-file .#ci --command bash -c $'
           aws ecr get-login-password \
             | skopeo login \
             --username AWS \
@@ -341,7 +345,7 @@ jobs:
           ./scripts/deploy-image.sh "${image[0]}" \'testnet\' "$CI_REGISTRY_IMAGE"
           '
           echo 'Waiting for Testnet Deployment'
-          nix develop .#ci --command bash -c $'
+          nix develop --no-update-lock-file --no-write-lock-file .#ci --command bash -c $'
           ./scripts/wait-for-deploy.js testnet.polykey.com
           '
 
@@ -366,7 +370,7 @@ jobs:
         run: |
           docker info
           mkdir -p $PK_TEST_TMPDIR
-          nix develop .#ci --command bash -c $'
+          nix develop --no-update-lock-file --no-write-lock-file .#ci --command bash -c $'
           image_and_tag="$(docker load --input ./builds/*docker* | cut -d\' \' -f3)"
           docker tag "$image_and_tag" "polykey-cli:testtarget"
           npm run test tests/integration/docker
@@ -403,7 +407,7 @@ jobs:
           CI_REGISTRY_IMAGE: '015248367786.dkr.ecr.ap-southeast-2.amazonaws.com/polykey'
         run: |
           echo 'Deploying container image to ECR'
-          nix develop .#ci --command bash -c $'
+          nix develop --no-update-lock-file --no-write-lock-file .#ci --command bash -c $'
           aws ecr get-login-password \
             | skopeo login \
             --username AWS \
@@ -414,7 +418,7 @@ jobs:
           ./scripts/deploy-image.sh "${image[0]}" \'mainnet\' "$CI_REGISTRY_IMAGE"
           '
           echo 'Waiting for Mainnet Deployment'
-          nix develop .#ci --command bash -c $'
+          nix develop --no-update-lock-file --no-write-lock-file .#ci --command bash -c $'
           ./scripts/wait-for-deploy.js mainnet.polykey.com
           '
           rm -f "$REGISTRY_AUTH_FILE"

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,9 @@
 {
   inputs = {
-    nixpkgs-matrix.url = "github:MatrixAI/nixpkgs-matrix";
+    nixpkgs-matrix = {
+      type = "indirect";
+      id = "nixpkgs-matrix";
+    };
     flake-utils.url = "github:numtide/flake-utils";
   };