1
0
Fork
You've already forked silverfish
0
forked from conjured/silverfish

Run cargo fmt check in CI #3

Open
cjdesno wants to merge 3 commits from cargo-fmt-check into main
pull from: cargo-fmt-check
merge into: cjdesno:main
cjdesno:main
cjdesno:add_musl
cjdesno:code_coverage_ci
cjdesno:update_rust_toolchain_ci
cjdesno:150_musl_build
cjdesno:build-aarch64
cjdesno:fix-serve-test
cjdesno:fix-ci
cjdesno:ci-frontend
cjdesno:ci-test
cjdesno:ci
No description provided.
Run cargo fmt check in CI
Some checks failed
Cargo Build and Test / silverfish-backend (pull_request) Failing after 32s
Frontend Checks / silverfish-frontend (pull_request) Successful in 34s
11c544591e
Install rustfmt in CI
Some checks failed
Cargo Build and Test / silverfish-backend (pull_request) Failing after 34s
Frontend Checks / silverfish-frontend (pull_request) Successful in 34s
e12463b9b4
Autoformat
All checks were successful
Cargo Build and Test / silverfish-backend (pull_request) Successful in 1m26s
Frontend Checks / silverfish-frontend (pull_request) Successful in 36s
a7cfbd249a
All checks were successful
Cargo Build and Test / silverfish-backend (pull_request) Successful in 1m26s
Frontend Checks / silverfish-frontend (pull_request) Successful in 36s
This pull request has changes conflicting with the target branch.
  • .forgejo/workflows/ci-backend.yml
  • binaries/silverfish-stall/src/auth.rs
  • binaries/silverfish-stall/src/commands/admin.rs
  • binaries/silverfish-stall/src/commands/db.rs
  • binaries/silverfish-stall/src/db.rs
  • binaries/silverfish-stall/src/web/views/mod.rs
  • binaries/silverfish-stall/src/web/views/root.rs
  • binaries/silverfish-stall/src/workers/mod.rs
  • crates/silverfish-money/src/lib.rs
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin cargo-fmt-check:cargo-fmt-check
git switch cargo-fmt-check

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff cargo-fmt-check
git switch cargo-fmt-check
git rebase main
git switch main
git merge --ff-only cargo-fmt-check
git switch cargo-fmt-check
git rebase main
git switch main
git merge --no-ff cargo-fmt-check
git switch main
git merge --squash cargo-fmt-check
git switch main
git merge --ff-only cargo-fmt-check
git switch main
git merge cargo-fmt-check
git push origin main
Sign in to join this conversation.
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
cjdesno/silverfish!3
Reference in a new issue
cjdesno/silverfish
No description provided.
Delete branch "cargo-fmt-check"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?