ci: back to using nix develop

GaloyMoney · Sep 20, 2023 · 6601353 · 6601353
1 parent dc123b2
commit 6601353
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/quickstart.yml b/.github/workflows/quickstart.yml
@@ -16,20 +16,13 @@ jobs:
       - uses: cachix/install-nix-action@v22
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
-      # - uses: HatsuneMiku3939/direnv-action@v1
       - name: Test quickstart
         run: |
-          nix-channel --add https://nixos.org/channels/nixpkgs-unstable
-          nix-channel --update
-          nix profile install nixpkgs#direnv
-          nix profile install nixpkgs#nix-direnv
-          source $HOME/.nix-profile/share/nix-direnv/direnvrc
-          direnv allow
           cd quickstart
-          ./bin/bump-galoy-git-ref.sh ${{ github.event.pull_request.head.sha }}
-          ./bin/bump-galoy-image-digest.sh local
-          ./bin/bump-mongodb-migrate-image-digest.sh local
-          make re-render
+          nix develop -c ./bin/bump-galoy-git-ref.sh ${{ github.event.pull_request.head.sha }}
+          nix develop -c./bin/bump-galoy-image-digest.sh local
+          nix develop -c ./bin/bump-mongodb-migrate-image-digest.sh local
+          nix develop -c make re-render
           source .envrc
           docker compose up -d
           ./bin/quickstart.sh
diff --git a/flake.nix b/flake.nix
@@ -33,6 +33,8 @@
         vendir
         jq
         ytt
+        direnv
+        nix-direnv
       ];
     in
       with pkgs; {
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,8 @@ @@
             vendir
             jq
             ytt
+            direnv
+            nix-direnv
           ];
         in
           with pkgs; {
@@ Expand Down @@