From 40a0423208c0863fb5be95f4e6bdc48a25482996 Mon Sep 17 00:00:00 2001 From: "jakob.stendahl" Date: Sun, 15 Jan 2023 22:45:19 +0100 Subject: Fix service worker error, update deploy script --- deploy.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index 81f23ce..9b8ab74 100755 --- a/deploy.sh +++ b/deploy.sh @@ -53,13 +53,24 @@ git add . git commit -m ":rocket: Deploy app v$VERSION" tput setaf 4 -echo "> Return to controller branch and tag last commit" +<<<<<<< Updated upstream +echo "> Return to main branch and tag last commit" tput sgr0 -git checkout controller +git checkout main #git tag "v$VERSION" -git push -f origin controller +git push -f origin main +======= +echo "> Return to main branch and tag last commit" +tput sgr0 + +git checkout main + +#git tag "v$VERSION" + +git push -f origin main +>>>>>>> Stashed changes #git push origin "v$VERSION" git push origin gh-pages -- cgit v1.2.3