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

ci-frontend #2

Open
cjdesno wants to merge 8 commits from ci-frontend into main
pull from: ci-frontend
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:cargo-fmt-check
cjdesno:ci-test
cjdesno:ci
No description provided. 
Co-authored-by: Srayan Jana <valorzard.kiko@outlook.com>
Reviewed-on: conjured/silverfish#69
Reviewed-by: Kat Marchán <zkat@noreply.codeberg.org>
Co-authored-by: ValorZard <valorzard@noreply.codeberg.org>
Co-committed-by: ValorZard <valorzard@noreply.codeberg.org>
Update cache paths
All checks were successful
Cargo Build and Test / Cargo build (pull_request) Successful in 5m58s
314aa203da
Rename cache step
All checks were successful
Cargo Build and Test / Cargo build (pull_request) Successful in 2m30s
6324900268
cjdesno force-pushed ci-frontend from fbc90bb1cf
All checks were successful
Cargo Build and Test / silverfish-backend (pull_request) Successful in 1m24s
Frontend Build and Lint / silverfish-frontend (pull_request) Successful in 35s
to 0d186dcda4
All checks were successful
Cargo Build and Test / silverfish-backend (pull_request) Successful in 1m25s
Frontend Build and Lint / silverfish-frontend (pull_request) Successful in 37s
2025年08月23日 23:06:39 +02:00 Compare
cjdesno force-pushed ci-frontend from 0d186dcda4
All checks were successful
Cargo Build and Test / silverfish-backend (pull_request) Successful in 1m25s
Frontend Build and Lint / silverfish-frontend (pull_request) Successful in 37s
to ae07676741
All checks were successful
Cargo Build and Test / silverfish-backend (pull_request) Successful in 1m25s
Frontend Build and Lint / silverfish-frontend (pull_request) Successful in 36s
2025年08月23日 23:09:39 +02:00 Compare
Upgrade node and rename job
All checks were successful
Cargo Build and Test / silverfish-backend (pull_request) Successful in 2m32s
Frontend Checks / silverfish-frontend (pull_request) Successful in 1m4s
619f4b0fae
All checks were successful
Cargo Build and Test / silverfish-backend (pull_request) Successful in 2m32s
Frontend Checks / silverfish-frontend (pull_request) Successful in 1m4s
This pull request has changes conflicting with the target branch.
  • .forgejo/workflows/ci-backend.yml
  • src-frontend/css/stall/app.css
  • src-frontend/esbuild.config.js
  • src-frontend/js/components/ajax-it.ts
  • src-frontend/js/site.ts
  • src-frontend/js/theme-picker.ts
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 ci-frontend:ci-frontend
git switch ci-frontend

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 ci-frontend
git switch ci-frontend
git rebase main
git switch main
git merge --ff-only ci-frontend
git switch ci-frontend
git rebase main
git switch main
git merge --no-ff ci-frontend
git switch main
git merge --squash ci-frontend
git switch main
git merge --ff-only ci-frontend
git switch main
git merge ci-frontend
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!2
Reference in a new issue
cjdesno/silverfish
No description provided.
Delete branch "ci-frontend"

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?