Skip to content

Commit

Permalink
Merge branch 'main' into feat/block-scanner
Browse files Browse the repository at this point in the history
  • Loading branch information
jbearer authored Oct 3, 2023
2 parents fd4a684 + d5a86d8 commit 4151bc4
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 41 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v23

- uses: cachix/cachix-action@v12
# If PR is from a non-collaborator (e. g. dependabot) the secrets are missing and the login to cachix fails.
Expand All @@ -49,7 +49,7 @@ jobs:
extraPullNames: nix-community

- name: Cache cargo
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: |
~/.cargo/registry/index
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Login to Github Container Repo
uses: docker/login-action@v2
uses: docker/login-action@v3
if: github.event_name != 'pull_request'
with:
registry: ghcr.io
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/combine-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- name: combine-prs
id: combine-prs
uses: github/combine-prs@v3.1.2
uses: github/combine-prs@v4.0.0
with:
github_token: ${{ github.token }}
labels: "dependabot,combined-pr"
2 changes: 1 addition & 1 deletion .github/workflows/contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
access_token: ${{ github.token }}

- name: Install Nix
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v23

- uses: cachix/cachix-action@v12
# If PR is from a non-collaborator (e. g. dependabot) the secrets are missing and the login to cachix fails.
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update_nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: update-flake-lock
on:
workflow_dispatch: # allows manual triggering
schedule:
- cron: '0 0 * * 0' # runs weekly on Sunday at 00:00
- cron: "0 0 * * 0" # runs weekly on Sunday at 00:00

jobs:
lockfile:
Expand All @@ -13,14 +13,14 @@ jobs:
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v23

- uses: cachix/cachix-action@v12
with:
name: espresso-systems-private
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

- name: Update flake.lock
uses: DeterminateSystems/update-flake-lock@v19
uses: DeterminateSystems/update-flake-lock@v20
with:
pr-title: "Weekly PR to bump flake.nix" # Title of PR to be created
7 changes: 4 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 27 additions & 27 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
{
buildInputs = [
# Rust dependencies
pkgconfig
pkg-config
openssl
curl
protobuf # to compile libp2p-autonat
Expand Down Expand Up @@ -212,7 +212,7 @@
{
buildInputs = [
# Rust dependencies
pkgconfig
pkg-config
openssl
curl
protobuf # to compile libp2p-autonat
Expand Down

0 comments on commit 4151bc4

Please sign in to comment.