Skip to content

Commit

Permalink
Merge pull request #60 from jakzal/travis-commits
Browse files Browse the repository at this point in the history
Configure git user for travis
  • Loading branch information
jakzal authored Mar 4, 2019
2 parents dd03d18 + 5a1897a commit e59c068
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ before_install:
- echo -e "machine github.com\n login $GH_TOKEN" >> ~/.netrc
- phpenv config-rm xdebug.ini || echo "XDebug is not enabled"
- export TOOLBOX_VERSION=$(echo ${TRAVIS_TAG:-"dev"} | sed -e 's/^v//')
- git config user.email '[email protected]' && git config user.name 'Jakub Zalas'
install:
- if [[ $deps = low ]]; then make update-min; else make install; fi
script:
Expand All @@ -38,4 +39,4 @@ env:
addons:
snaps:
- name: hub
classic: true
classic: true
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ website:
publish-website: website
cd build/website && \
git init . && \
git config user.email '[email protected]' && \
git config user.name 'Jakub Zalas' && \
git add . && \
git commit -m "Build the website" && \
git push --force --quiet "https://github.com/jakzal/toolbox.git" master:gh-pages
Expand All @@ -114,8 +112,6 @@ update-phars:
php bin/devkit.php update:phars
git diff --exit-code resources/ || \
( \
(git config user.email || git config user.email '[email protected]') && \
(git config user.name || git config user.name 'Jakub Zalas') && \
git checkout -b tools-update && \
git add resources/*.json && \
git commit -m "Update tools" && \
Expand Down

0 comments on commit e59c068

Please sign in to comment.