aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjakob.stendahl <jakob.stendahl@infomedia.dk>2023-01-15 22:48:27 +0100
committerJakob Stendahl <jakob.stendahl@outlook.com>2023-01-15 22:51:40 +0100
commitb7b331dd28ff0fb9763c20c8cc65c0c69cf460c8 (patch)
tree26aa014008c2223d27131726e872fd8b33c4c118
parentefce298d75214acfcfa5a53d7a5e139157c69ede (diff)
downloadmicrobit-gamepad-b7b331dd28ff0fb9763c20c8cc65c0c69cf460c8.tar.gz
microbit-gamepad-b7b331dd28ff0fb9763c20c8cc65c0c69cf460c8.zip
Fix error in deploy script
-rwxr-xr-xdeploy.sh11
-rw-r--r--package-lock.json4
-rw-r--r--package.json2
3 files changed, 3 insertions, 14 deletions
diff --git a/deploy.sh b/deploy.sh
index 9b8ab74..bb3f79b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -53,7 +53,6 @@ git add .
git commit -m ":rocket: Deploy app v$VERSION"
tput setaf 4
-<<<<<<< Updated upstream
echo "> Return to main branch and tag last commit"
tput sgr0
@@ -62,15 +61,5 @@ git checkout main
#git tag "v$VERSION"
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
diff --git a/package-lock.json b/package-lock.json
index f690da2..eb14828 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "microbit-gamepad",
- "version": "1.0.1",
+ "version": "1.0.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "microbit-gamepad",
- "version": "1.0.1",
+ "version": "1.0.2",
"license": "MIT",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.2"
diff --git a/package.json b/package.json
index 4698651..e195b30 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "microbit-gamepad",
- "version": "1.0.1",
+ "version": "1.0.2",
"description": "",
"license": "MIT",
"scripts": {