Skip to content

Test branch #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 11, 2021
Merged

Test branch #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
126dfa8
Remove merge feature branch to develop
ggeop Oct 11, 2021
60b0078
Remove merge feature branch to develop
ggeop Oct 11, 2021
b530bde
Remove merge feature branch to develop
ggeop Oct 11, 2021
0169f45
Remove merge feature branch to develop
ggeop Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ jobs:

stages:
- name: test
if: branch!=master AND branch!=develop AND branch!=^untagged.*
if: NOT (branch IN (develop,master))
- name: merge (develop --> master)
if: branch=develop AND type!=pull_request
if: branch==develop AND NOT(type==pull_request)
- name: deploy
if: branch=master
if: branch==master

notifications:
email: false
2 changes: 1 addition & 1 deletion bin/deploy/merge_develop_to_master.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ "$TRAVIS_BRANCH" == "develop" ]; then
git fetch
git reset --hard
git checkout master || echo "Git checkout master failed"
git merge --ff-only "$TRAVIS_COMMIT" || echo "Merge develop to master failed"
git merge "$TRAVIS_COMMIT" || echo "Merge develop to master failed"
git push -q https://[email protected]/ggeop/Python-ai-assistant master
fi