Skip to content

Commit

Permalink
Merge branch '3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
crynobone committed Mar 9, 2015
2 parents e7ba436 + 1551330 commit 1320d24
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Composer
composer.lock
vendor/*

# Build
.subsplit/
9 changes: 7 additions & 2 deletions build/subsplit-basic.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/sh
git subsplit init git@github.com:orchestral/support.git

if [ -d .subsplit ]; then
git subsplit update
else
git subsplit init git@github.com:orchestral/support.git
fi

git subsplit publish --heads="master 3.0" --no-tags src/Facades:git@github.com:orchestral/support-facades.git
git subsplit publish --heads="master 3.0" --no-tags src/Providers:git@github.com:orchestral/support-providers.git
git subsplit publish --heads="master 2.1 2.2 3.0" --no-tags src/Support:git@github.com:orchestral/support-core.git
rm -rf .subsplit/
9 changes: 7 additions & 2 deletions build/subsplit-full.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/sh
git subsplit init git@github.com:orchestral/support.git

if [ -d .subsplit ]; then
git subsplit update
else
git subsplit init git@github.com:orchestral/support.git
fi

git subsplit publish --heads="master 3.0" src/Facades:git@github.com:orchestral/support-facades.git
git subsplit publish --heads="master 3.0" src/Providers:git@github.com:orchestral/support-providers.git
git subsplit publish --heads="master 2.1 2.2 3.0" src/Support:git@github.com:orchestral/support-core.git
rm -rf .subsplit/
16 changes: 16 additions & 0 deletions build/subsplit-tag.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/sh

if [ -z "$1" ]; then
echo "No argument supplied";
exit 1;
fi

if [ -d .subsplit ]; then
git subsplit update
else
git subsplit init git@github.com:orchestral/support.git
fi

git subsplit publish --heads="master 3.0" --tags=$1 src/Facades:git@github.com:orchestral/support-facades.git
git subsplit publish --heads="master 3.0" --tags=$1 src/Providers:git@github.com:orchestral/support-providers.git
git subsplit publish --heads="master 2.1 2.2 3.0" --tags=$1 src/Support:git@github.com:orchestral/support-core.git

0 comments on commit 1320d24

Please sign in to comment.