From b98e227ce7a19c6472039f4500473569f7211147 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Wed, 25 Sep 2019 17:35:31 +0200 Subject: [PATCH 1/4] Fix CI to only release docker tags on master branch Fixes the build error in pull request #119 and also prevent release tags that are not also commited on the master branch. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5abc62..21aa147 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ services: stages: - build - name: docker-tag - if: tag IS present + if: (tag IS present) AND (branch = master) - name: docker-push if: branch = master From 894be6744e71bcd24c6fe0bea76547ca68af0394 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Wed, 25 Sep 2019 17:43:37 +0200 Subject: [PATCH 2/4] Remove docker tag build step for pull requests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 21aa147..cd54561 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ services: stages: - build - name: docker-tag - if: (tag IS present) AND (branch = master) + if: (tag IS present) AND (branch = master) AND (type != pull_request) - name: docker-push if: branch = master From b7651c4dae1397261baee69a6304b3d9ebb398dd Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Wed, 25 Sep 2019 17:49:20 +0200 Subject: [PATCH 3/4] Remove docker-push build step for pull requests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd54561..822ce45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ stages: - name: docker-tag if: (tag IS present) AND (branch = master) AND (type != pull_request) - name: docker-push - if: branch = master + if: (branch = master) AND (type != pull_request) jobs: include: From a9858803616d848c85b9c5699cde0f004c209996 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Sun, 22 Sep 2019 23:00:06 +0200 Subject: [PATCH 4/4] version 1.2019.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd42a64..4148102 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ net.sourceforge.plantuml plantuml - 1.2019.10 + 1.2019.11 javax.servlet