jenkins-bot has submitted this change and it was merged.
Change subject: build: Fix script paths to be /bin/.. not /bin/../.. which
isn't a thing
......................................................................
build: Fix script paths to be /bin/.. not /bin/../.. which isn't a thing
Change-Id: I78eeeb033d3a2496c0be93fb22e7fd3004dc7aaa
---
M bin/update-oojs-ui.sh
M bin/update-oojs.sh
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/update-oojs-ui.sh b/bin/update-oojs-ui.sh
index 140a31b..f9bea93 100755
--- a/bin/update-oojs-ui.sh
+++ b/bin/update-oojs-ui.sh
@@ -9,13 +9,13 @@
exit 1
fi
-REPO_DIR=$(cd "$(dirname $0)/../.."; pwd) # Root dir of the git repo working
tree
+REPO_DIR=$(cd "$(dirname $0)/.."; pwd) # Root dir of the git repo working tree
TARGET_DIR="lib/oojs-ui" # Destination relative to the root of the repo
NPM_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-oojs-ui') # e.g.
/tmp/update-oojs-ui.rI0I5Vir
# Prepare working tree
cd "$REPO_DIR" &&
-git reset $TARGET_DIR && git checkout $TARGET_DIR && git fetch origin &&
+git reset -- $TARGET_DIR && git checkout -- $TARGET_DIR && git fetch origin &&
git checkout -B upstream-oojs-ui origin/master || exit 1
# Fetch upstream version
diff --git a/bin/update-oojs.sh b/bin/update-oojs.sh
index b53c595..38d78ad 100755
--- a/bin/update-oojs.sh
+++ b/bin/update-oojs.sh
@@ -9,13 +9,13 @@
exit 1
fi
-REPO_DIR=$(cd "$(dirname $0)/../.."; pwd) # Root dir of the git repo working
tree
+REPO_DIR=$(cd "$(dirname $0)/.."; pwd) # Root dir of the git repo working tree
TARGET_DIR="lib/oojs" # Destination relative to the root of the repo
NPM_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-oojs') # e.g.
/tmp/update-oojs.rI0I5Vir
# Prepare working tree
cd "$REPO_DIR" &&
-git reset $TARGET_DIR && git checkout $TARGET_DIR && git fetch origin &&
+git reset -- $TARGET_DIR && git checkout -- $TARGET_DIR && git fetch origin &&
git checkout -B upstream-oojs origin/master || exit 1
# Fetch upstream version
--
To view, visit https://gerrit.wikimedia.org/r/175652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78eeeb033d3a2496c0be93fb22e7fd3004dc7aaa
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
