Merge remote-tracking branch 'origin/main' into node20

yaxitech · May 2, 2024 · 30f63d1 · 30f63d1
2 parents 615ce67 + f50123d
commit 30f63d1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -16,10 +16,10 @@ jobs:
       GC_DONT_GC: 1
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v18
+        uses: cachix/install-nix-action@v26
         with:
           extra_nix_config: |
             experimental-features = nix-command flakes recursive-nix

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -19,10 +19,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v18
+        uses: cachix/install-nix-action@v26
         with:
           extra_nix_config: |
             experimental-features = nix-command flakes recursive-nix
@@ -45,18 +45,18 @@ jobs:
           - 1 # shallow clone
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: ${{ matrix.fetch-depth }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v18
+        uses: cachix/install-nix-action@v26
         with:
           extra_nix_config: |
             experimental-features = nix-command flakes recursive-nix
 
       - name: 'Setup Cachix'
-        uses: cachix/cachix-action@v10
+        uses: cachix/cachix-action@v14
         with:
           name: wurzelpfropf
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN_PUBLIC }}'
@@ -106,7 +106,7 @@ jobs:
         run: |
           nix profile list --profile '${{ steps.inputs-from-jq.outputs.nix_profile_path }}'
           rev=$(nix flake metadata --json "github:yaxitech/ragenix" | jq -r .locks.nodes.nixpkgs.locked.rev)
-          nix profile list --profile '${{ steps.inputs-from-jq.outputs.nix_profile_path }}' | grep "jq" | grep -q "$rev"
+          nix profile list --profile '${{ steps.inputs-from-jq.outputs.nix_profile_path }}' --json | jq -r '.elements.jq.url' | grep -q "$rev"
 
       - name: List installed packages
         run:
@@ -122,13 +122,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # We need a full checkout for a Git diff
           fetch-depth: 0
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v18
+        uses: cachix/install-nix-action@v26
         with:
           extra_nix_config: |
             experimental-features = nix-command flakes recursive-nix
@@ -147,13 +147,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # We need a full checkout for the tests
           fetch-depth: 0
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v18
+        uses: cachix/install-nix-action@v26
         with:
           extra_nix_config: |
             experimental-features = nix-command flakes recursive-nix

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ jobs:
   tests:
     runs-on: self-hosted
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: yaxitech/nix-install-pkgs-action@v4
         with:
           packages: "nixpkgs#hello, figlet"
@@ -75,7 +75,7 @@ jobs:
   tests:
     runs-on: self-hosted
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: yaxitech/nix-install-pkgs-action@v4
         with:
           expr: 'pkgs.python3.withPackages(ps: with ps; [toml pyyaml])'