From 1aad276d6f40f7b70cdf6bfc45372ea5fe66a2f2 Mon Sep 17 00:00:00 2001 From: Dennis Eisold <de@itstall.de> Date: Tue, 26 Nov 2019 22:45:02 +0100 Subject: [PATCH 1/7] Gitlab-CI Test --- .gitlab-ci.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 649bec9..9a8ae4f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,22 @@ image: maven:latest -java: +stages: + - build + - test + - deploy + +job build dependencies: + stage: build + script: make build dependencies + +job build artifacts: + stage: build + script: make build artifacts + +job test: stage: test - script: - - mvn verify - artifacts: - reports: - junit: - - target/surefire-reports/TEST-*.xml - - target/failsafe-reports/TEST-*.xml \ No newline at end of file + script: make test + +job deploy: + stage: deploy + script: make deploy -- GitLab From 6eb3f856e0f7294bbdce32fa758ee14b2b2edd48 Mon Sep 17 00:00:00 2001 From: Dennis Eisold <de@itstall.de> Date: Tue, 26 Nov 2019 22:46:29 +0100 Subject: [PATCH 2/7] Gitlab-CI Test --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a8ae4f..a052fdd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,16 +7,16 @@ stages: job build dependencies: stage: build - script: make build dependencies + script: mvn build dependencies job build artifacts: stage: build - script: make build artifacts + script: mvn build artifacts job test: stage: test - script: make test + script: mvn test job deploy: stage: deploy - script: make deploy + script: mvn deploy -- GitLab From 7c22a3d8d6e913029989150b22161096d3c2cea9 Mon Sep 17 00:00:00 2001 From: Dennis Eisold <de@itstall.de> Date: Tue, 26 Nov 2019 22:48:52 +0100 Subject: [PATCH 3/7] Gitlab-CI Test --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a052fdd..a6884d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,18 @@ image: maven:latest stages: + - clean - build - test - deploy -job build dependencies: - stage: build - script: mvn build dependencies +job clean: + stage: clean + script: mvn clean -job build artifacts: +job compile: stage: build - script: mvn build artifacts + script: mvn compile job test: stage: test -- GitLab From 3947f267678c3af508619d4ab0434bc62ac077e5 Mon Sep 17 00:00:00 2001 From: Dennis Eisold <de@itstall.de> Date: Tue, 26 Nov 2019 22:54:52 +0100 Subject: [PATCH 4/7] Gitlab-CI Test --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6884d3..6651f57 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,4 +20,4 @@ job test: job deploy: stage: deploy - script: mvn deploy + script: mvn assembly:assembly -- GitLab From 2a774853240319a0d0ca4e072d7e9cbd232bff5c Mon Sep 17 00:00:00 2001 From: Dennis Eisold <de@itstall.de> Date: Tue, 26 Nov 2019 23:07:19 +0100 Subject: [PATCH 5/7] Gitlab-CI Test --- .gitlab-ci.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6651f57..1b9bfde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,18 +6,23 @@ stages: - test - deploy -job clean: +Clean Project files: stage: clean script: mvn clean -job compile: +Compile new version: stage: build script: mvn compile -job test: +Run JUnit tests and verify: stage: test - script: mvn test + script: mvn verify + artifacts: + reports: + junit: + - target/surefire-reports/TEST-*.xml + - target/failsafe-reports/TEST-*.xml -job deploy: +Deploy new version as Release: stage: deploy script: mvn assembly:assembly -- GitLab From 7732b87f545ce075f66bbc8c2174c4868cc4ff32 Mon Sep 17 00:00:00 2001 From: Dennis Eisold <de@itstall.de> Date: Tue, 26 Nov 2019 23:38:05 +0100 Subject: [PATCH 6/7] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a0199f8..940811b 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ +[](https://www.gitrepo.de/alfatrainingkurse/java/enigma/commits/master) + Link zum [Wiki](https://www.gitrepo.de/alfatrainingkurse/java/enigma/wikis/home) \ No newline at end of file -- GitLab From 2ea318ce68db580af2130dfdd2ee3e7105a3200d Mon Sep 17 00:00:00 2001 From: Dennis Eisold <de@itstall.de> Date: Wed, 27 Nov 2019 00:04:19 +0100 Subject: [PATCH 7/7] Gitlab-CI Test --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b9bfde..a9cdd0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,4 +25,6 @@ Run JUnit tests and verify: Deploy new version as Release: stage: deploy - script: mvn assembly:assembly + script: + - mvn versions:set -DnewVersion=$CI_COMMIT_TAG + - mvn assembly:assembly -- GitLab