-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from gantry/develop
Update from original
- Loading branch information
Showing
151 changed files
with
4,004 additions
and
2,017 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| # Linguist Normalizer | ||
| *.yaml linguistic-language=PHP | ||
| *.twig linguistic-language=PHP | ||
| **/js/main.js linguist-vendored=true | ||
| **/css-compiled/*.css linguist-vendored=true | ||
| **/gulpfile.js linguist-vendored | ||
| **/js/*.js linguist-vendored | ||
| **/js/*.json linguist-vendored | ||
| **/css-compiled/*.css linguist-vendored |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| language: php | ||
| php: | ||
| - '5.6' | ||
| branches: | ||
| except: | ||
| - master | ||
| - /^feature\// | ||
| notifications: | ||
| email: | ||
| on_success: never | ||
| on_failure: always | ||
| env: | ||
| global: | ||
| # GH_TOKEN | ||
| - secure: "kY4hfKlKczsizZVxHMA1THnh3w2kmMOPnaadpnAwbpYcCQOlCgwgz7tbGEB5gPAbsKJfQMEgdlEAWnRiUUQdQE5vKhiwS14Jo3pry/i10iWCys/M+zLn6uclXCuTQUjNm4L0ReLQu5nkCPRyDL/F9vOp6v3h+vd4gfTEw+9TntfOg1g5RIW8tG1iBm12IhFgoQjP+wKUXluGTqZIlJyV5Jx1ef51Da3nSxd8lPHrsxElzZEebTRd2CvVM5vY+wZY4xjl0GjZo2v8ps3HI7IOZYygzYGLkH+Hbir+SHNTLZX6IMWQWuq56iiRb5CZm64GNULnrXAEaP2EZyiEHkA7gQgddtCzhMlGq5qyrYBfrPRukjRGEhRHEMvntUQloGlPYsETzO6ulvYBRlkS26s4C1uw6RBSgv58vWjhoXHyt7cDzv9yjKsboRE+2KCogkbbBDt7DxFRuUsQ9SnslzPuAFzBKZXik8Ea5Fl2Q/3tXOMt3fXp5CTQ5fT3X0p82orln5o1yQ1GZ3xWBtprMoWz5GyRq67G+gZql/BTI834JeQQ/TBhOszWV2a0zcw2SyjVFf9SeZTfNSOmpJz60aJcZSegEuTuxEfm+P3x34WAP/AFIt3vAFxRGad6A8ceP0rbY7R3WzaJcRWpuLCVzcmMukKNOltbzL0We3fF267Z7d4=" | ||
| before_install: | ||
| - composer self-update | ||
| - if [ ! -z "$TRAVIS_TAG" ]; then | ||
| gem install sass; | ||
| npm install -g gulp &>/dev/null; | ||
| fi | ||
| install: | ||
| - if [ ! -z "$TRAVIS_TAG" ]; then | ||
| npm install &>/dev/null; | ||
| cd $TRAVIS_BUILD_DIR/platforms/common && npm install &>/dev/null; | ||
| cd $TRAVIS_BUILD_DIR/assets/common && npm install &>/dev/null; | ||
| cd $TRAVIS_BUILD_DIR/engines/common/nucleus && npm install &>/dev/null; | ||
| fi | ||
| - cd $TRAVIS_BUILD_DIR/src && composer install --no-dev; | ||
| - cd $TRAVIS_BUILD_DIR/bin/build && composer install --no-dev | ||
| script: | ||
| - export SHORT_COMMIT=$(echo $TRAVIS_COMMIT | cut -c1-9) | ||
| - echo "Branch ($TRAVIS_BRANCH)" | ||
| - cd $TRAVIS_BUILD_DIR/bin/build | ||
| - if [ "$TRAVIS_BRANCH" == "develop" ]; then | ||
| cd $TRAVIS_BUILD_DIR/platforms/joomla; | ||
| sed -i -e "s/<version>.*<\/version>/<version>dev-$SHORT_COMMIT<\/version>/g" pkg_gantry5.xml; | ||
| cd $TRAVIS_BUILD_DIR/bin/build; | ||
| php build.php dev -propertyfile release.ini -Dpackage_dir=$TRAVIS_BUILD_DIR/repo_pkgs -Dstr.fileversion=_develop; | ||
| elif [ ! -z "$TRAVIS_TAG" ]; then | ||
| php build.php prod -propertyfile release.ini -Dpackage_dir=$TRAVIS_BUILD_DIR/repo_pkgs -Dxml.version=$TRAVIS_TAG; | ||
| else | ||
| echo "($TRAVIS_BRANCH) is not a supported branch for builds"; | ||
| fi | ||
| before_deploy: | ||
| - export PROJ_PKGS_PATH=$TRAVIS_BUILD_DIR/repo_pkgs | ||
| - export PROJ_PKGS=$HOME/build/$TRAVIS_REPO_SLUG/repo_pkgs/*.zip | ||
| - if [ "$TRAVIS_BRANCH" == 'develop' ]; then | ||
| FILES_PATH=$PROJ_PKGS_PATH; | ||
| JSON="{"; | ||
| FILES=$FILES_PATH/*.zip; | ||
| COUNT=`ls $FILES 2>/dev/null | wc -l | awk '{print $1}'`; | ||
| COMMIT=$TRAVIS_COMMIT; | ||
| SHORT_COMMIT=$(echo $COMMIT | cut -c1-9) | ||
| CURRENT_DATE=`date +%s` | ||
|
|
||
| JSON+="\"count\":$COUNT,"; | ||
| JSON+="\"commit\":\"$COMMIT\","; | ||
| JSON+="\"commit_short\":\"$SHORT_COMMIT\","; | ||
| JSON+="\"date\":\"$CURRENT_DATE\","; | ||
| JSON+="\"files\":["; | ||
|
|
||
| i=0; | ||
| for file in ${FILES[@]}; do | ||
| i=$(($i + 1)); | ||
| SIZE=`wc -c < $file | awk '{print $1}'`; | ||
| DATE=`stat --format=\"%m\" $file`; | ||
| JSON+="{"; | ||
| JSON+="\"file\":\"${file##*/}\","; | ||
| JSON+="\"size\":$SIZE,"; | ||
| JSON+="\"date\":$DATE"; | ||
| JSON+="}"; | ||
|
|
||
| if [ $i != $COUNT ]; then | ||
| JSON+=","; | ||
| fi | ||
| done; | ||
| JSON+="]}"; | ||
|
|
||
| echo $JSON > "$FILES_PATH/map.json"; | ||
| fi | ||
| deploy: | ||
| - provider: releases | ||
| api_key: | ||
| secure: "KgEZx0dHoPLOYj9T087flZKgaf4ggasJcd/DOjHjsXKhjyLYuWZNLOdJaT0MQ+UJ2RwzW+7ESR1lquwEqUN8uPFaA05SZwrCyJU1pOgTYqunM+Sz+lRWANMjgwtGNAQvPfTTAoaKZxrOVSMxv0U2OBAHE2lEsDvz7kwCuHbsoU3/xY144ecUG2lWItHjxQr2X7GmApBgCZ63OPaHK/NP1a8xtkQT+kTfKRHIZwPCyRplSRhqaa8ftQoi5SynaHtECi9/RYCRp3wgclbCPHRH3Eez4li+AdE8Q/X+LK/jmIYqOUWvq8IpS0ePg67fuE4cBNLYBrbPWgSPfUka3/61KyGRTw+2ofdf9eMOtJQa7JZUSWWUEeeyeBFIomNvY40nWSmC+T/l5EixIwBFF7CzVatnDPCz3w4gPYxAVwQjTtKqqFu6ZfeQNp0asj9OqukF3nJbN42iuIh6vxHxIQ6U3WMo+0t507i0rYf3Esl3YGlMVUuN7mNlWNv5eKrfD2CLHeBiDvo6SRCdYpgLu6FMBnwM2Fadlm51nAN/tpSxXEA1gUoVT3rJ8e6vnFcdy1ZHq1DPMtiZ8oMLBtdq8lcDs8DzKqCwImfmsDtM7M040JG/MuB5kVUXLcA5ycRCh1piDUAqITmvPucYHO8hT63cMZHwcxlqw1Ta3ckB4Ng3Eqg=" | ||
| skip_cleanup: true | ||
| file_glob: true | ||
| file: "${PROJ_PKGS}" | ||
| on: | ||
| repo: gantry/gantry5 | ||
| tags: true | ||
| - provider: s3 | ||
| access_key_id: AKIAIGEIWVFNBMVSH2UA | ||
| secret_access_key: | ||
| secure: "DP32BDS3fk7/tLsZxj5CjiAT5GLHQFNOFte9Rds7eird+xqOSqUXHVplkOSVPKCt6V3CIO3wtxe97T4cuxtoobwVlwF8WRmrS4x98u2sLIS9lSZZzDg/W8tkLjOmW9QOKFtBEykj1z1i9nYDlhKFDtGNIkN7juZUz5UZ2S3Unwsm94vcm8ATghXGclwfib329I+7GVIA24PMUv2ETl0PGs+s+D1KmhXeU5UwharxnM+X4kyIsCBPrxXX+2QfAiSrjqKwHfzGQjRJIAQ6m4UdzuZWbxSAiJ4TrWrwRYDCKn8Va72g9UcUdiOyLd6Eg54iSCKdbQ+zELYjhcuwO7g4kpc6V/wgcHYVG4stPyuiXc2G+ZAGXDtW0H7QobeXEUTAsad2AshmCA+lFCmecywBdpsDSYp9ZBY0Qfevncmx0CIWlaPPVjUQ3FMn+oniamJlmbwpmHLiZuCyDE9sSxeQrPSI/7N+zSD03EM6AxIBswaF6XzIhcP3aPz9BzJ2v/YHpPzxtqLaLhEswxWkghmRYASaJn6Ut9xwuWkfhO2UIzkBW6RA3HV6CjZ5opQBe4IyxiVsB2qPzQfxGXz4pN2BoTbuLyf4jS0CA1h6g/7vpCz6VnOuTzBg/c7nQjk8Y69hUYHL91lSlZ/a7tNHe3z9DtaxVg24MG56e+mevYpUgLk=" | ||
| bucket: gantry5 | ||
| local-dir: "$PROJ_PKGS_PATH" | ||
| upload-dir: nightly | ||
| skip_cleanup: true | ||
| acl: public_read | ||
| on: | ||
| repo: gantry/gantry5 | ||
| branch: develop | ||
| after_deploy: | ||
| - echo "Branch ($TRAVIS_BRANCH) - Tag ($TRAVIS_TAG)" | ||
| - if [ ! -z "$TRAVIS_TAG" ]; then | ||
| git config user.email "bot@travis-ci.org"; | ||
| git config user.name "Travis CI"; | ||
| rm -rf $PROJ_PKGS_PATH; | ||
| git checkout -b master; | ||
| git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"; | ||
| git fetch --quiet; | ||
| cd $TRAVIS_BUILD_DIR/bin/build; | ||
| php build.php prod-versions -propertyfile release.ini -Dupdate_versions=true -Dxml.version=$TRAVIS_TAG; | ||
| cd $TRAVIS_BUILD_DIR; | ||
| git commit -am "Release [$TRAVIS_TAG] - Automatic Version Number Updates"; | ||
| git push --force --quiet --set-upstream https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git master:master &>/dev/null; | ||
| fi | ||
| - if [ "$TRAVIS_BRANCH" == 'develop' ]; then | ||
| curl -L http://gantry.org/cibuilds >/dev/null 2>&1; | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 5.0.0-rc.3-dev | ||
| @version@ |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.