Skip to content

Commit

Permalink
chore: updated how we push subtrees to a smarter approach
Browse files Browse the repository at this point in the history
now we don't push directly to main... we should just make a new branch off our trunk before we push using the provided scripts. this will push a clean branch of just the subtree changes to the subtree.
  • Loading branch information
kriscoleman committed Jun 29, 2023
1 parent e0de585 commit 344911b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"subtrees:pull:go-witness": "git subtree pull --prefix subtrees/go-witness/ go-witness main --squash",
"subtrees:pull:witness": "git subtree pull --prefix subtrees/witness/ witness main --squash",
"subtrees:pull:witness-run-action": "git subtree pull --prefix subtrees/witness-run-action/ witness-run-action main --squash",
"subtress:push:archivista": "git subtree push --prefix subtrees/archivista/ archivista main",
"subtress:push:go-witness": "git subtree push --prefix subtrees/go-witness/ go-witness main",
"subtress:push:witness": "git subtree push --prefix subtrees/witness/ witness main",
"subtress:push:witness-run-action": "git subtree push --prefix subtrees/witness-run-action/ witness-run-action main",
"subtress:push:archivista": "git subtree push --prefix subtrees/archivista/ archivista $(git rev-parse --abbrev-ref HEAD)",
"subtress:push:go-witness": "git subtree push --prefix subtrees/go-witness/ go-witness $(git rev-parse --abbrev-ref HEAD)",
"subtress:push:witness": "git subtree push --prefix subtrees/witness/ witness $(git rev-parse --abbrev-ref HEAD)",
"subtress:push:witness-run-action": "git subtree push --prefix subtrees/witness-run-action/ witness-run-action $(git rev-parse --abbrev-ref HEAD)",
"test:archivista": "cd subtrees/archivista && go test ./... && cd ../..",
"test:go-witness": "cd subtrees/go-witness && go test ./... && cd ../..",
"test:go": "npm run test:archivista && npm run test:go-witness && npm run test:judge-api && npm run test:witness",
Expand Down

0 comments on commit 344911b

Please sign in to comment.