Update packages, pull in compiled-only repos

dapps/ui/Cargo.toml

@@ -13,8 +13,8 @@ rustc_version = "0.1"
 parity-ui-dev = { path = "../../js", optional = true }
 parity-ui-old-dev = { path = "../../js-old", optional = true }
 # This is managed by the js/scripts/release.sh script on CI - keep it in a single line
-parity-ui-old-precompiled = { git = "https://github.com/paritytech/js-precompiled.git", optional = true, branch = "v1" }
-parity-ui-precompiled = { git = "https://github.com/paritytech/js-precompiled.git", optional = true, branch = "master" }
+parity-ui-old-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-9-v1.git", optional = true }
+parity-ui-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-9-shell.git", optional = true }
 
 [features]
 no-precompiled-js = ["parity-ui-dev", "parity-ui-old-dev"]

js-old/scripts/push-precompiled.sh

@@ -2,51 +2,39 @@
 set -e
 
 # variables
+PVER="1-9"
+PTYPE="v1"
 UTCDATE=`date -u "+%Y%m%d-%H%M%S"`
-PRECOMPILED_BRANCH="v1"
-GIT_JS_PRECOMPILED="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/js-precompiled.git"
+PRE_REPO="js-dist-paritytech/parity-${CI_BUILD_REF_NAME}-${PVER}-${PTYPE}.git"
+PRE_REPO_TOKEN="https://${GITHUB_JS_PRECOMPILED}:@github.com/${PRE_REPO}"
 BASEDIR=`dirname $0`
-GITLOG=./.git/.git-release.log
-
-# setup the git user defaults for the current repo
-function setup_git_user {
-  git config push.default simple
-  git config merge.ours.driver true
-  git config user.email "$GITHUB_EMAIL"
-  git config user.name "GitLab Build Bot"
-}
-
-# change into the build directory
-pushd $BASEDIR
-cd ../.dist
-
-# add local files and send it up
-echo "*** [v1 precompiled] Setting up GitHub config for js-precompiled"
-rm -rf ./.git
-git init
-setup_git_user
-
-echo "*** [v1 precompiled] Checking out $PRECOMPILED_BRANCH branch"
-git remote add origin $GIT_JS_PRECOMPILED
-git fetch origin 2>$GITLOG
-git checkout -b $PRECOMPILED_BRANCH
-
-echo "*** [v1 precompiled] Committing compiled files for $UTCDATE"
-mv build ../build.new
-git add .
-git commit -m "$UTCDATE [update]"
-git merge origin/$PRECOMPILED_BRANCH -X ours --commit -m "$UTCDATE [merge]"
-git rm -r build
+
+pushd $BASEDIR/..
+
+echo "*** [$PRE_REPO] Cloning repo"
+rm -rf precompiled
+git clone https://github.com/$PRE_REPO precompiled
+cd precompiled
+git config push.default simple
+git config merge.ours.driver true
+git config user.email "$GITHUB_EMAIL"
+git config user.name "GitLab Build Bot"
+git remote set-url origin $PRE_REPO_TOKEN > /dev/null 2>&1
+
+echo "*** [$PRE_REPO] Copying build"
 rm -rf build
-git commit -m "$UTCDATE [cleanup]"
-mv ../build.new build
+cp -rf ../.dist/build .
+
+echo "*** [$PRE_REPO] Adding to git"
+echo "$UTCDATE" >README.md
 git add .
-git commit -m "$UTCDATE [release]"
+git commit -m "$UTCDATE"
 
-echo "*** [v1 precompiled] Merging remote"
-git push origin HEAD:refs/heads/$PRECOMPILED_BRANCH 2>$GITLOG
+echo "*** [$PRE_REPO] Pushing upstream"
+git push --quiet origin HEAD:refs/heads/master > /dev/null 2>&1
 
-# move to root
+cd ..
+rm -rf precompiled
 popd
 
 # exit with exit code

js-old/scripts/test.js

@@ -1 +1 @@
-// test script 14
+// test script 15