Skip to content

Commit a2250bd

Browse files
committed
Revert back to cachix/install-nix-action
1 parent eef5675 commit a2250bd

2 files changed

Lines changed: 3 additions & 30 deletions

File tree

.github/workflows/deploy.yaml

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,9 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- uses: actions/checkout@v4
26-
- uses: nixbuild/nix-quick-install-action@v32
27-
28-
- name: Generate cache key
29-
run: |
30-
nixpkgs_hash=$(grep -Eom1 'archive/[0-9a-f]{40}\.tar\.gz' shell.nix | cut -d'/' -f2 | cut -d'.' -f1)
31-
echo "NIXPKGS_HASH=$nixpkgs_hash" >> $GITHUB_ENV
32-
echo "CACHE_KEY=${{ runner.os }}-$nixpkgs_hash" >> $GITHUB_ENV
33-
34-
- uses: nix-community/cache-nix-action@v6
35-
with:
36-
primary-key: nix-${{ env.CACHE_KEY }}
37-
38-
- name: Setup NIX_PATH
39-
run: |
40-
path=$(nix eval --impure --expr "(import (fetchTarball \"https://github.com/NixOS/nixpkgs/archive/${{ env.NIXPKGS_HASH }}.tar.gz\") {}).path")
41-
echo "NIX_PATH=nixpkgs=$path" >> $GITHUB_ENV
42-
43-
- name: Get cache directories
44-
id: cache-dirs
45-
run: |
46-
nix-shell -p uv --run "
47-
echo \"UV_CACHE=\$(uv cache dir)\"
48-
" | tee -a $GITHUB_OUTPUT
49-
50-
- name: Cache files and packages
51-
uses: actions/cache@v4
26+
- uses: cachix/install-nix-action@v31
5227
with:
53-
key: pkg-${{ env.CACHE_KEY }}-${{ hashFiles('uv.lock') }}
54-
path: |
55-
${{ steps.cache-dirs.outputs.UV_CACHE }}
56-
.venv
28+
nix_path: nixpkgs=channel:nixos-unstable
5729

5830
- name: Configure deployment tag
5931
id: tag

shell.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ let
3131
uv
3232
ruff
3333
coreutils
34+
curl
3435
jq
3536
(postgresql_17_jit.withPackages (ps: [ ps.postgis ]))
3637
valkey

0 commit comments

Comments
 (0)