From 7db1dbcd65860645966b25fe9a51e6331a5f1b3a Mon Sep 17 00:00:00 2001 From: Yuriy Shafranyuk Date: Tue, 2 Jan 2018 23:19:31 +0200 Subject: [PATCH 1/7] Add gitflow versioning (#35) * Versioning test jgitflow (#27) * Added jgitflow plugin * Added release section * Versioning test jgitflow (#28) * Added jgitflow plugin * Added custom version and remove ssh agent * Added maven plugin and circle code that make release (#29) * Fix gitflow plugin dependency (#30) * test code * test code * test code * deploy any branch * Added plugin to dependency management * comment code * trigger build * skip tests * skip tests * try to fix dependencies * full name of plugin * remove gitflow from report section * removed gitfloe from dependency management * added gitflow from dependency management * added gitflow to release * added gitflow configs to command * remove dependency * remove no needed commands * possible fix * fix gitflow release (#31) * test code * test code * test code * deploy any branch * comment code * trigger build * skip tests * skip tests * try to fix dependencies * full name of plugin * remove gitflow from report section * removed gitfloe from dependency management * added gitflow from dependency management * added gitflow to release * added gitflow configs to command * remove dependency * remove no needed commands * possible fix * Ignore some commands. Added configs in all gitflow declaration * release any branch * Test no needed configs * Test no needed configs * Test no needed configs * revert changes for test * Fix gitflow release (#32) * test code * test code * test code * deploy any branch * comment code * trigger build * skip tests * skip tests * try to fix dependencies * full name of plugin * remove gitflow from report section * removed gitfloe from dependency management * added gitflow from dependency management * added gitflow to release * added gitflow configs to command * remove dependency * remove no needed commands * possible fix * Ignore some commands. Added configs in all gitflow declaration * release any branch * Test no needed configs * Test no needed configs * Test no needed configs * revert changes for test * Another try to release * pull branch * revert formatting * update versions for 1.1.5.0-vgs-test release * Fix gitflow release (#33) * test code * test code * test code * deploy any branch * comment code * trigger build * skip tests * skip tests * try to fix dependencies * full name of plugin * remove gitflow from report section * removed gitfloe from dependency management * added gitflow from dependency management * added gitflow configs to command * remove dependency * remove no needed commands * possible fix * Ignore some commands. Added configs in all gitflow declaration * release any branch * Test no needed configs * Test no needed configs * Test no needed configs * revert changes for test * Another try to release * pull branch * revert formatting * change version. skip tests * Fix gitflow release (#34) * test code * test code * test code * deploy any branch * comment code * trigger build * skip tests * skip tests * try to fix dependencies * full name of plugin * remove gitflow from report section * removed gitfloe from dependency management * added gitflow from dependency management * added gitflow configs to command * remove dependency * remove no needed commands * possible fix * Ignore some commands. Added configs in all gitflow declaration * release any branch * Test no needed configs * Test no needed configs * Test no needed configs * revert changes for test * Another try to release * pull branch * revert formatting * change version. skip tests * reset uncommited * fiz * update versions for 1.1.5.0-vgs-test release * update for next development version 1.1.6.0-vgs-test-SNAPSHOT * test code * test code * test code * deploy any branch * comment code * trigger build * skip tests * skip tests * try to fix dependencies * remove gitflow from report section * removed gitfloe from dependency management * added gitflow from dependency management * added gitflow configs to command * remove dependency * remove no needed commands * possible fix * Ignore some commands. Added configs in all gitflow declaration * release any branch * Test no needed configs * Test no needed configs * Test no needed configs * revert changes for test * Another try to release * pull branch * revert formatting * change version. skip tests * fiz * revert version * change release branch * change branch name --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index e05e713c2..d015eed4a 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: version: oraclejdk8 environment: AWS_PROFILE: vgs-dev - RELEASE_BRANCH: versioning-test + RELEASE_BRANCH: versioning-test dependencies: override: - ./env.sh From a28683c95162579c66f098119e5f4f8c70f92fde Mon Sep 17 00:00:00 2001 From: circleci Date: Thu, 4 Jan 2018 13:44:12 +0000 Subject: [PATCH 2/7] update versions for 1.1.5.0-VGS release --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index b5da12649..619d84932 100644 --- a/pom.xml +++ b/pom.xml @@ -5,6 +5,7 @@ jar 1.1.5.0-VGS-test-SNAPSHOT LittleProxy + LittleProxy is a high performance HTTP proxy written in Java and using the Netty networking framework. From 88793eeadfc7a12e7b71b0d3c9c5ac24ef2f332b Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Thu, 4 Jan 2018 17:58:23 +0200 Subject: [PATCH 3/7] change to next snapshot version --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 619d84932..b5da12649 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,6 @@ jar 1.1.5.0-VGS-test-SNAPSHOT LittleProxy - LittleProxy is a high performance HTTP proxy written in Java and using the Netty networking framework. From 0e70088c64c035fcadc4eeabe43c778b5a9032f2 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Thu, 4 Jan 2018 18:20:07 +0200 Subject: [PATCH 4/7] skip tests when tag set --- scripts/run_circle_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_circle_tests.sh b/scripts/run_circle_tests.sh index 21245dc4b..35b321d22 100755 --- a/scripts/run_circle_tests.sh +++ b/scripts/run_circle_tests.sh @@ -2,5 +2,5 @@ if [ "$CIRCLE_TAG" == "" ] then - mvn test -T2C + mvn test -T2C fi \ No newline at end of file From 8c0bb846c02229d9b349af7de41a30e164af675e Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Thu, 4 Jan 2018 18:31:36 +0200 Subject: [PATCH 5/7] change branch --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index d015eed4a..e05e713c2 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: version: oraclejdk8 environment: AWS_PROFILE: vgs-dev - RELEASE_BRANCH: versioning-test + RELEASE_BRANCH: versioning-test dependencies: override: - ./env.sh From 346a97139eb3ad5a276c76ccd0f17c60d2335544 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Thu, 4 Jan 2018 18:39:01 +0200 Subject: [PATCH 6/7] change permissions --- scripts/run_circle_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_circle_tests.sh b/scripts/run_circle_tests.sh index 35b321d22..21245dc4b 100755 --- a/scripts/run_circle_tests.sh +++ b/scripts/run_circle_tests.sh @@ -2,5 +2,5 @@ if [ "$CIRCLE_TAG" == "" ] then - mvn test -T2C + mvn test -T2C fi \ No newline at end of file From fd97f1aec05dd1aed90dbe7b8aff3356ef124df1 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Thu, 4 Jan 2018 19:17:02 +0200 Subject: [PATCH 7/7] add user email --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index e05e713c2..12b8f0698 100644 --- a/circle.yml +++ b/circle.yml @@ -22,6 +22,7 @@ deployment: tag: /.*/ commands: - git config user.name "circleci" + - git config user.email "circleci@vgs.com" - git fetch - git checkout $RELEASE_BRANCH - git pull origin $RELEASE_BRANCH