Merge branch 'main' into combined-prs-branch

EspressoSystems · Jan 15, 2024 · 037a6b5 · 037a6b5
2 parents 38b0c06 + 117ba0b
commit 037a6b5
Show file tree

Hide file tree

Showing 4 changed files with 168 additions and 53 deletions.
diff --git a/.github/workflows/build_static.yml b/.github/workflows/build_static.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Install Nix
         uses: cachix/install-nix-action@v23
 
-      - uses: cachix/cachix-action@v12
+      - uses: cachix/cachix-action@v13
         # If PR is from a non-collaborator (e. g. dependabot) the secrets are missing and the login to cachix fails.
         continue-on-error: true
         with:

diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v4.1.0
+        uses: github/combine-prs@v5.0.0
         with:
           github_token: ${{ github.token }}
           labels: "dependabot,combined-pr"
diff --git a/.github/workflows/update_nix.yml b/.github/workflows/update_nix.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Install Nix
         uses: cachix/install-nix-action@v23
 
-      - uses: cachix/cachix-action@v12
+      - uses: cachix/cachix-action@v13
         with:
           name: espresso-systems-private
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'