Skip to content

Instantly share code, notes, and snippets.

@mattboutet
Forked from devinivy/deploy.sh
Created March 24, 2018 13:06
Show Gist options
  • Save mattboutet/2882e73ec3d993a3a1477017e90211b0 to your computer and use it in GitHub Desktop.
Save mattboutet/2882e73ec3d993a3a1477017e90211b0 to your computer and use it in GitHub Desktop.
Publish a hapi pal flavor
# Ensure flavor and pal branch are up-to-date locally
git checkout flavor-<name> # Go to the flavor branch
git merge pal/pal # Ensure we're not squashing irrelevant changes, e.g. to the readme
git push pal flavor-<name> # Push the updated flavor branch

git reset pal/pal # See the changes as they appear on top of the main pal branch
git checkout --detach # Leave the current branch– at this point we dont need to update any branch
git add ... # List updated files
git commit -m "(flavor) <name> v<major>.<minor>.<patch>" # Create the squashed commit

git tag -a <name>-v<major>.<minor>.<patch> -m "(flavor) <name> v<major>.<minor>.<patch>" # Tag it with its version
git tag --force -a <name> -m "(flavor) <name> v<major>.<minor>.<patch>" # Tag it for convenience, overridding the previous

git push pal <name>-v<major>.<minor>.<patch> # Push versioned tag
git push --delete pal <name> # Remove single tagged commit on the pal repo—we're about to replace it!
git push pal <name> # Push the single tagged commit up to the pal repo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment