Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ if [ -n "$changed_tomls" ]; then
./contrib/update-lock-files.sh
stale_locks=$(git diff --name-only -- Cargo-minimal.lock Cargo-recent.lock)
if [ -n "$stale_locks" ]; then
git checkout -- Cargo-minimal.lock Cargo-recent.lock
echo "pre-commit: Cargo.toml changed and lockfiles are stale!"
echo "Stale lockfiles:"
echo "$stale_locks"
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/lock-maintenance.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Cargo lock maintenance
on:
schedule:
- cron: "0 20 * * 0" # weekly at 20:00 UTC
workflow_dispatch:

jobs:
update-lock-files:
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
- run: UPDATE_DEPS=true bash contrib/update-lock-files.sh
- uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
commit-message: "chore: update Cargo lock files"
title: "chore: update Cargo lock files"
branch: chore/cargo-lock-update
add-paths: |
Cargo-minimal.lock
Cargo-recent.lock
14 changes: 0 additions & 14 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,6 @@ jobs:
- name: Run tests
run: RUST_LOG=debug bash contrib/test.sh

Lint-FFI:
runs-on: ubuntu-latest
steps:
- name: "Checkout repo"
uses: actions/checkout@v4
- name: "Use cache"
uses: Swatinem/rust-cache@v2
- name: "Install nix"
uses: DeterminateSystems/determinate-nix-action@main
- name: "Use nix cache"
uses: DeterminateSystems/magic-nix-cache-action@main
- name: "Run linting check"
run: cd payjoin-ffi && nix develop -c ./contrib/lint.sh

Comment on lines -43 to -56

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know why this was separated in the first place? Chesterson's fence?

@benalleng benalleng Jun 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked into the history for this very question. I think that we simply didn't want any failures to hit the main crate at the time as there is no other explanation was given to keep them separate. #846 included commits to actually make it pass the lint so I suspect that was partly why as there was perhaps some expectation of continued instability. @arminsabouri do you have a recollection about any additional motivation here?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know the workspaces used to be separated because there was no way to compile payjoin-ffi with the old MSRV, so that'd be one potential reason. Now everything is in the top level Cargo.toml workspace it can all be compiled and linted together.

Lint:
runs-on: ubuntu-latest
steps:
Expand Down
Loading
Loading