From 8cd41eebacdfd5856aedbcf64943e4dcec887e37 Mon Sep 17 00:00:00 2001 From: ggeop Date: Mon, 11 Oct 2021 20:35:49 +0300 Subject: [PATCH 1/2] Dummy commit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 872fdae1..f6f4e446 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,4 +49,4 @@ stages: if: branch==master AND (NOT(type==pull_request)) notifications: - email: false \ No newline at end of file + email: false From a06f35a09c2551c94a5f13b0d6be2e61f074d77c Mon Sep 17 00:00:00 2001 From: ggeop Date: Mon, 11 Oct 2021 20:39:02 +0300 Subject: [PATCH 2/2] Remove merge feature branch to develop --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6f4e446..85b9d179 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,6 @@ jobs: - bash bin/deploy/install_python_dependencies.sh script: - sudo bash bin/tests/run_tests_on_travis.sh - - stage: merge (feature branch --> develop) - install: skip - script: - - sudo bash bin/deploy/merge_feature_branch_to_develop.sh - stage: merge (develop --> master) install: skip script: @@ -41,8 +37,6 @@ jobs: stages: - name: test if: NOT(branch==master) - - name: merge (feature branch --> develop) - if: (NOT (branch IN (develop,master))) AND (NOT(type==pull_request)) - name: merge (develop --> master) if: branch==develop AND (NOT(type==pull_request)) - name: deploy