Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-27 22:49:56 -05:00
Code Issues Activity

Added fallback remote for grunt master

Browse source 
no issue

- our docs do not tell the user to set up an `upstream` remote for Casper, so
  running `grunt master` will fail as it expects `upstream` to exist
- this commit adds detection for if `upstream` exists, and falls back to
  `origin` if not
This commit is contained in:
Daniel Lockyer 2021-01-14 12:28:55 +00:00
parent 6d2dfff5b5
commit 2bdb9c5d0a
No known key found for this signature in database
GPG key ID: FFBC6FA2A6F6ABC1
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Gruntfile.js
View file

@ -219,7 +219,7 @@ const configureGrunt = function (grunt) {
const upstream = grunt.option('upstream') || process.env.GHOST_UPSTREAM || 'upstream'; const upstream = grunt.option('upstream') || process.env.GHOST_UPSTREAM || 'upstream';
grunt.log.writeln('Pulling down the latest master from ' + upstream); grunt.log.writeln('Pulling down the latest master from ' + upstream);
return ` return `
git submodule sync git submodule sync && \
git submodule update git submodule update
if ! git diff --exit-code --quiet --ignore-submodules=untracked; then if ! git diff --exit-code --quiet --ignore-submodules=untracked; then
@ -227,11 +227,16 @@ const configureGrunt = function (grunt) {
exit 1 exit 1
fi fi
git checkout master REMOTE=$(git remote | grep "${upstream}" > /dev/null && echo "${upstream}" || echo "origin")
git pull ${upstream} master
yarn git checkout master && \
git pull $REMOTE master && \
yarn && \
git submodule foreach " git submodule foreach "
git checkout master && git pull ${upstream} master git checkout master
REMOTE=$(git remote | grep "${upstream}" > /dev/null && echo "${upstream}" || echo "origin")
git pull $REMOTE master
" "
`; `;
} }