From 344911be14b572fa7b465c25fda59dfa9dc8b316 Mon Sep 17 00:00:00 2001 From: Kris Coleman Date: Tue, 27 Jun 2023 23:54:08 -0400 Subject: [PATCH] chore: updated how we push subtrees to a smarter approach 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. --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 6c98e186..4b273a46 100644 --- a/package.json +++ b/package.json @@ -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",