From cb6323f3fe5219c369e1ec22bed121a40fc6b865 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 17:24:28 +0200 Subject: [PATCH 01/29] test code --- circle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 03a13e590..304734bfa 100644 --- a/circle.yml +++ b/circle.yml @@ -11,6 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: + - mvn -B -X -e gitflow:release-start gitflow:release-finish - mvn test -T2C deployment: snapshot: @@ -26,5 +27,5 @@ deployment: - git checkout $RELEASE_BRANCH - git pull origin $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests - git push origin $RELEASE_BRANCH From 422fb136e44058aab1cc74d15cb91a00a8cd162e Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 17:39:19 +0200 Subject: [PATCH 02/29] test code --- circle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 304734bfa..1bfb76f16 100644 --- a/circle.yml +++ b/circle.yml @@ -20,12 +20,11 @@ deployment: commands: - mvn deploy -DskipTests=true release: - tag: /.*/ commands: - git config user.name "circleci" - git fetch - git checkout $RELEASE_BRANCH - git pull origin $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests - git push origin $RELEASE_BRANCH From 999e3a0dabb92c7ee8311825a20f97d135f7a611 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 17:39:30 +0200 Subject: [PATCH 03/29] test code --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index 1bfb76f16..11fc45c00 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,6 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn -B -X -e gitflow:release-start gitflow:release-finish - mvn test -T2C deployment: snapshot: From de3eefdaeee21d0e9ba415834d541d70e804040d Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 17:49:14 +0200 Subject: [PATCH 04/29] deploy any branch --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 11fc45c00..f084a33c2 100644 --- a/circle.yml +++ b/circle.yml @@ -19,6 +19,7 @@ deployment: commands: - mvn deploy -DskipTests=true release: + branch: /.*/ commands: - git config user.name "circleci" - git fetch From e209b9af1898b21a38bb603d52786910d33175bc Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 18:11:34 +0200 Subject: [PATCH 05/29] comment code --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index f084a33c2..8954d95ee 100644 --- a/circle.yml +++ b/circle.yml @@ -26,5 +26,5 @@ deployment: - git checkout $RELEASE_BRANCH - git pull origin $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests - git push origin $RELEASE_BRANCH From 60f5c383bf1d6b66b076bccbf9d665db297e0fde Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 18:21:28 +0200 Subject: [PATCH 06/29] trigger build --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index 8954d95ee..a3571fbd9 100644 --- a/circle.yml +++ b/circle.yml @@ -24,7 +24,6 @@ deployment: - git config user.name "circleci" - git fetch - git checkout $RELEASE_BRANCH - - git pull origin $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests - git push origin $RELEASE_BRANCH From 7769071eb5027030e2e12fff88064a84deff77c8 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 12:30:19 +0200 Subject: [PATCH 07/29] skip tests --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index a3571fbd9..46434dd8c 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn test -T2C + - mvn --version deployment: snapshot: branch: vgs-edition From f1df87a498d2ba7ba48a834e699860e0c661da8b Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 12:30:43 +0200 Subject: [PATCH 08/29] skip tests --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 46434dd8c..7f9aa64de 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn --version + - mvn test -T2 -DskipTests deployment: snapshot: branch: vgs-edition From e78f06cfb22002a8522910bb4c8ab6a9b9197852 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 12:42:46 +0200 Subject: [PATCH 09/29] try to fix dependencies --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index cbdcea653..29602e861 100644 --- a/pom.xml +++ b/pom.xml @@ -767,6 +767,12 @@ + + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.8.0 + From 061299fda08f207688e38a59c034cc79240d2e17 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 14:10:24 +0200 Subject: [PATCH 10/29] full name of plugin --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 7f9aa64de..b469f60d2 100644 --- a/circle.yml +++ b/circle.yml @@ -25,5 +25,5 @@ deployment: - git fetch - git checkout $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests - git push origin $RELEASE_BRANCH From f840d99a7564d6e7623bd2919cec2939882cf86e Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 14:18:32 +0200 Subject: [PATCH 11/29] remove gitflow from report section --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index 29602e861..cbdcea653 100644 --- a/pom.xml +++ b/pom.xml @@ -767,12 +767,6 @@ - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.8.0 - From 8b341500fd6152c0aa4a3e07cc3b8bd867f388e4 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 14:23:42 +0200 Subject: [PATCH 12/29] removed gitfloe from dependency management --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index cbdcea653..04a709577 100644 --- a/pom.xml +++ b/pom.xml @@ -508,7 +508,6 @@ maven-resources-plugin 3.0.2 - com.amashchenko.maven.plugin gitflow-maven-plugin From bbcc6deba736be14a51d1278510d33684dd0d745 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 14:29:25 +0200 Subject: [PATCH 13/29] added gitflow from dependency management --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 04a709577..cbdcea653 100644 --- a/pom.xml +++ b/pom.xml @@ -508,6 +508,7 @@ maven-resources-plugin 3.0.2 + com.amashchenko.maven.plugin gitflow-maven-plugin From 3971b96d476c70f1fea59677be0be5bbf391e020 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 15:09:37 +0200 Subject: [PATCH 14/29] added gitflow configs to command --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index b469f60d2..7f9aa64de 100644 --- a/circle.yml +++ b/circle.yml @@ -25,5 +25,5 @@ deployment: - git fetch - git checkout $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests - git push origin $RELEASE_BRANCH From 8a23888bf40b3d600c86eaf5b7f8f20897867c9f Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 15:14:24 +0200 Subject: [PATCH 15/29] remove dependency --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index cbdcea653..d3e418592 100644 --- a/pom.xml +++ b/pom.xml @@ -508,12 +508,6 @@ maven-resources-plugin 3.0.2 - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.8.0 - From 69437aca58f2973c046cce12a09909195b15d0fa Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 15:16:00 +0200 Subject: [PATCH 16/29] remove no needed commands --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 7f9aa64de..b469f60d2 100644 --- a/circle.yml +++ b/circle.yml @@ -25,5 +25,5 @@ deployment: - git fetch - git checkout $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests - git push origin $RELEASE_BRANCH From 02bdb0e7f49d5c17bb20478a4d7af43b370ef8e3 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 15:25:08 +0200 Subject: [PATCH 17/29] possible fix --- circle.yml | 4 ++-- pom.xml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index b469f60d2..5f9092f03 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn test -T2 -DskipTests + - mvn test -T2C deployment: snapshot: branch: vgs-edition @@ -19,7 +19,7 @@ deployment: commands: - mvn deploy -DskipTests=true release: - branch: /.*/ + tag: /.*/ commands: - git config user.name "circleci" - git fetch diff --git a/pom.xml b/pom.xml index d3e418592..04ed588ca 100644 --- a/pom.xml +++ b/pom.xml @@ -508,6 +508,12 @@ maven-resources-plugin 3.0.2 + + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.8.0 + From fc00cdc775a6a10c66fed38284223fc9fc603d28 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:17:15 +0200 Subject: [PATCH 18/29] Ignore some commands. Added configs in all gitflow declaration --- circle.yml | 2 +- pom.xml | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 5f9092f03..2c50b64b6 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn test -T2C + - mvn test -T2C -DskipTests deployment: snapshot: branch: vgs-edition diff --git a/pom.xml b/pom.xml index 04ed588ca..3a838d84b 100644 --- a/pom.xml +++ b/pom.xml @@ -213,6 +213,31 @@ gitflow-maven-plugin 1.8.0 + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.8.0 + + true + 2 + true + false + true + true + + + versioning-test + versioning-test + release- + + + + + update versions for @{version} release + update for next development version @{version} + + + @@ -508,11 +533,31 @@ maven-resources-plugin 3.0.2 - + com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 + + true + 2 + true + false + true + true + + + versioning-test + versioning-test + release- + + + + + update versions for @{version} release + update for next development version @{version} + + From 952b5f276e6626c31b4754b3bd51453bf21d682c Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:21:58 +0200 Subject: [PATCH 19/29] release any branch --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 2c50b64b6..c4097675d 100644 --- a/circle.yml +++ b/circle.yml @@ -19,7 +19,7 @@ deployment: commands: - mvn deploy -DskipTests=true release: - tag: /.*/ + branch: /.*/ commands: - git config user.name "circleci" - git fetch From ca9655c1bb5cd16fe7a8a59881a305cd5be5777b Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:26:48 +0200 Subject: [PATCH 20/29] Test no needed configs --- pom.xml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/pom.xml b/pom.xml index 3a838d84b..9b2b881ec 100644 --- a/pom.xml +++ b/pom.xml @@ -224,14 +224,12 @@ false true true - versioning-test versioning-test release- - update versions for @{version} release update for next development version @{version} @@ -538,26 +536,6 @@ com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 - - true - 2 - true - false - true - true - - - versioning-test - versioning-test - release- - - - - - update versions for @{version} release - update for next development version @{version} - - From 2463871f651b25145f98154965e14c0ba544a3d4 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:33:29 +0200 Subject: [PATCH 21/29] Test no needed configs --- pom.xml | 72 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 9b2b881ec..a9a6aee14 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 org.littleshoot littleproxy @@ -6,7 +8,8 @@ 1.1.5.0-VGS-SNAPSHOT LittleProxy - LittleProxy is a high performance HTTP proxy written in Java and using the Netty networking framework. + LittleProxy is a high performance HTTP proxy written in Java and using the Netty networking + framework. http://littleproxy.org @@ -213,29 +216,6 @@ gitflow-maven-plugin 1.8.0 - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.8.0 - - true - 2 - true - false - true - true - - versioning-test - versioning-test - release- - - - - update versions for @{version} release - update for next development version @{version} - - - @@ -536,6 +516,28 @@ com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 + + true + 2 + true + false + true + true + + + versioning-test + versioning-test + release- + + + + + update versions for @{version} release + + update for next development version @{version} + + + @@ -594,8 +596,10 @@ - update versions for @{version} release - update for next development version @{version} + update versions for @{version} release + + update for next development version @{version} + @@ -631,12 +635,14 @@ - + org.littleshoot.proxy.Launcher - + log4j.xml src/main/config/log4j.xml @@ -800,7 +806,9 @@ a@littleshoot.org LittleShoot http://www.littleshoot.org/ - Developer + + Developer + -5 @@ -810,7 +818,9 @@ ox@getlantern.org GetLantern https://www.getlantern.org/ - Developer + + Developer + -5 From e834f7000671a02a351693a828276f9ca5b13cf4 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:37:37 +0200 Subject: [PATCH 22/29] Test no needed configs --- pom.xml | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index a9a6aee14..f8607be77 100644 --- a/pom.xml +++ b/pom.xml @@ -516,28 +516,6 @@ com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 - - true - 2 - true - false - true - true - - - versioning-test - versioning-test - release- - - - - - update versions for @{version} release - - update for next development version @{version} - - - @@ -596,10 +574,8 @@ - update versions for @{version} release - - update for next development version @{version} - + update versions for @{version} release + update for next development version @{version} From bb19ea15388d11a1e6eab581f32d4dfc45d59d81 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:50:06 +0200 Subject: [PATCH 23/29] revert changes for test --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index c4097675d..5f9092f03 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn test -T2C -DskipTests + - mvn test -T2C deployment: snapshot: branch: vgs-edition @@ -19,7 +19,7 @@ deployment: commands: - mvn deploy -DskipTests=true release: - branch: /.*/ + tag: /.*/ commands: - git config user.name "circleci" - git fetch From 89e3119d654cd966711f3b73fff85352e2676445 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 18:11:31 +0200 Subject: [PATCH 24/29] Another try to release --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 5f9092f03..537eeb47e 100644 --- a/circle.yml +++ b/circle.yml @@ -19,7 +19,7 @@ deployment: commands: - mvn deploy -DskipTests=true release: - tag: /.*/ + branch: /.*/ commands: - git config user.name "circleci" - git fetch From 929983ce68aaa895aa4c166c9653bd27aa35a9e1 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 18:24:08 +0200 Subject: [PATCH 25/29] pull branch --- circle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 537eeb47e..ec9067285 100644 --- a/circle.yml +++ b/circle.yml @@ -19,11 +19,12 @@ deployment: commands: - mvn deploy -DskipTests=true release: - branch: /.*/ + tag: /.*/ commands: - git config user.name "circleci" - git fetch - git checkout $RELEASE_BRANCH + - git pull origin $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests - git push origin $RELEASE_BRANCH From e5f01c273aee04388fd17a157b675956776d21ed Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 18:37:09 +0200 Subject: [PATCH 26/29] revert formatting --- pom.xml | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index f8607be77..cbdcea653 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 org.littleshoot littleproxy @@ -8,8 +6,7 @@ 1.1.5.0-VGS-SNAPSHOT LittleProxy - LittleProxy is a high performance HTTP proxy written in Java and using the Netty networking - framework. + LittleProxy is a high performance HTTP proxy written in Java and using the Netty networking framework. http://littleproxy.org @@ -611,14 +608,12 @@ - + org.littleshoot.proxy.Launcher - + log4j.xml src/main/config/log4j.xml @@ -782,9 +777,7 @@ a@littleshoot.org LittleShoot http://www.littleshoot.org/ - - Developer - + Developer -5 @@ -794,9 +787,7 @@ ox@getlantern.org GetLantern https://www.getlantern.org/ - - Developer - + Developer -5 From 9fd4d11d08514057c411e13d24e079f0ee74a8c5 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Wed, 27 Dec 2017 15:38:01 +0200 Subject: [PATCH 27/29] change version. skip tests --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index ec9067285..1ff731f41 100644 --- a/circle.yml +++ b/circle.yml @@ -26,5 +26,5 @@ deployment: - git checkout $RELEASE_BRANCH - git pull origin $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests - git push origin $RELEASE_BRANCH From 3b564de3169f59ca7475d8f1c3043de8e34c86de Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Wed, 27 Dec 2017 16:15:18 +0200 Subject: [PATCH 28/29] reset uncommited --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 1ff731f41..dffd3f013 100644 --- a/circle.yml +++ b/circle.yml @@ -25,6 +25,7 @@ deployment: - git fetch - git checkout $RELEASE_BRANCH - git pull origin $RELEASE_BRANCH + - git reset --hard - git tag -d $CIRCLE_TAG - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests - git push origin $RELEASE_BRANCH From e614d97d893019555eb5f2fa81b9207a67587a90 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Wed, 27 Dec 2017 16:17:13 +0200 Subject: [PATCH 29/29] fiz --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index dffd3f013..f33d935c0 100644 --- a/circle.yml +++ b/circle.yml @@ -27,5 +27,5 @@ deployment: - git pull origin $RELEASE_BRANCH - git reset --hard - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy -DskipTests - git push origin $RELEASE_BRANCH