Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #639

Merged
merged 6 commits into from
Oct 3, 2023
Merged

Update dependencies #639

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f2c925
Update flake.lock
sveitser Sep 29, 2023
86e0069
Update github actions
sveitser Sep 29, 2023
24528bf
Update some rust deps
sveitser Sep 29, 2023
4930f8a
Update jf-primitives
sveitser Sep 29, 2023
6b6adb7
Merge branch 'main' into ma/update-deps
sveitser Sep 29, 2023
0581ad5
Merge remote-tracking branch 'origin/main' into ma/update-deps
sveitser Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build_static.yml
View file
Open in desktop
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/cache@v3.3.1
uses: actions/cache@v3.3.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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
26 changes: 13 additions & 13 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop

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
View file
Open in desktop
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
Loading