spotted the flaw in my plan - it keeps kicking me back to master

This commit is contained in:
Richard Harris
2019-02-03 09:29:55 -05:00
parent 228b0864de
commit b888f6bf24
2 changed files with 20 additions and 32 deletions

View File

@@ -6,28 +6,12 @@ cd "$(dirname $0)"/..
echo "$SSH_KEY" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
# make sure we're on master, and delete the rollup and webpack branches
git symbolic-ref HEAD refs/heads/master
git reset --hard
git branch -D rollup webpack
# branch names
DEFAULT=master
ROLLUP=rollup
WEBPACK=webpack
# create the rollup branch off the current master
git checkout -b rollup
node _template/build-pkg.js rollup
git rm -r --cached .travis.yml _template package_template.json webpack.config.js
git add package.json
git commit -m 'Sapper template for Rollup'
git symbolic-ref HEAD refs/heads/master
git reset --hard
# create the webpack branch off the current master
git checkout -b webpack
node _template/build-pkg.js webpack
git rm -r --cached .travis.yml _template package_template.json rollup.config.js
git add package.json
git commit -m 'Sapper template for webpack'
git symbolic-ref HEAD refs/heads/master
git reset --hard
./create-branches.sh $DEFAULT $ROLLUP $WEBPACK
# force push rollup and webpack branches
git push git@github.com:sveltejs/sapper-template.git rollup webpack -f
git push git@github.com:sveltejs/sapper-template.git $ROLLUP $WEBPACK -f

View File

@@ -1,25 +1,29 @@
#!/bin/bash
cd "$(dirname $0)"/..
# make sure we're on master, and delete the rollup-v3 and webpack-v3 branches
git symbolic-ref HEAD refs/heads/master
git reset --hard
git branch -D rollup-v3 webpack-v3
DEFAULT=$1
ROLLUP=$2
WEBPACK=$3
# create the rollup-v3 branch off the current master
git checkout -b rollup-v3
# make sure we're on master, and delete the $ROLLUP and $WEBPACK branches
git symbolic-ref HEAD "refs/heads/$DEFAULT"
git reset --hard
git branch -D $ROLLUP $WEBPACK
# create the $ROLLUP branch off the current master
git checkout -b $ROLLUP
node _template/build-pkg.js rollup
git rm -r --cached .travis.yml _template package_template.json webpack.config.js
git add package.json
git commit -m 'Sapper template for Rollup'
git symbolic-ref HEAD refs/heads/master
git symbolic-ref HEAD "refs/heads/$DEFAULT"
git reset --hard
# create the webpack-v3 branch off the current master
git checkout -b webpack-v3
# create the $WEBPACK branch off the current master
git checkout -b $WEBPACK
node _template/build-pkg.js webpack
git rm -r --cached .travis.yml _template package_template.json rollup.config.js
git add package.json
git commit -m 'Sapper template for webpack'
git symbolic-ref HEAD refs/heads/master
git symbolic-ref HEAD "refs/heads/$DEFAULT"
git reset --hard