Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
brookinsconsulting committed Aug 22, 2018
2 parents 3d8e6a0 + c3dc333 commit 2831723
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion bin/.travis/trusty/setup_ezplatform.sh
Expand Up @@ -64,9 +64,12 @@ if [[ -n "${DEPENDENCY_PACKAGE_NAME}" ]]; then
BASE_PACKAGE_NAME=`basename ${DEPENDENCY_PACKAGE_NAME}`
echo "> Move ${DEPENDENCY_PACKAGE_DIR} to ${EZPLATFORM_BUILD_DIR}/${BASE_PACKAGE_NAME}"
mv ${DEPENDENCY_PACKAGE_DIR} ${EZPLATFORM_BUILD_DIR}/${BASE_PACKAGE_NAME}
cd ${EZPLATFORM_BUILD_DIR}/${BASE_PACKAGE_NAME}

# perform full checkout to allow using as local Composer depenency
git fetch --unshallow

echo "> Create temporary branch in ${DEPENDENCY_PACKAGE_NAME}"
cd ${EZPLATFORM_BUILD_DIR}/${BASE_PACKAGE_NAME}
# reuse HEAD commit id for better knowledge about what got checked out
TMP_TRAVIS_BRANCH=tmp_`git rev-parse --short HEAD`
git checkout -b ${TMP_TRAVIS_BRANCH}
Expand Down

0 comments on commit 2831723

Please sign in to comment.