From c37a87e490d699048643ebc28828caa9ad7fc8cd Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 5 Jan 2018 17:00:28 +0100 Subject: [PATCH] Explicit checkout (#7474) --- js/scripts/push-cargo.sh | 1 + js/scripts/test.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/js/scripts/push-cargo.sh b/js/scripts/push-cargo.sh index f1f2a6a61..f776e54e5 100755 --- a/js/scripts/push-cargo.sh +++ b/js/scripts/push-cargo.sh @@ -13,6 +13,7 @@ git config merge.ours.driver true git config user.email "$GITHUB_EMAIL" git config user.name "GitLab Build Bot" git remote set-url origin $GIT_PARITY > /dev/null 2>&1 +git checkout $BRANCH git reset --hard origin/$BRANCH 2>/dev/null git submodule update diff --git a/js/scripts/test.js b/js/scripts/test.js index 7121de462..4db2181a9 100644 --- a/js/scripts/test.js +++ b/js/scripts/test.js @@ -1 +1 @@ -// test script 28 +// test script 29