From e7ae2e01e8bb8f072804f50465c4b8dd39ef9d67 Mon Sep 17 00:00:00 2001 From: Christopher Moyer Date: Fri, 18 Aug 2023 23:08:41 +0000 Subject: [PATCH 1/4] add ci config --- .gitlab-ci.yml | 80 +++++++++++++++++++++++++++++++++++++++++++++++++ ci_settings.xml | 16 ++++++++++ 2 files changed, 96 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 ci_settings.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..c25f376 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,80 @@ +# To contribute improvements to CI/CD templates, please follow the Development guide at: +# https://docs.gitlab.com/ee/development/cicd/templates.html +# This specific template is located at: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Maven.gitlab-ci.yml + +# Build JAVA applications using Apache Maven (http://maven.apache.org) +# For docker image tags see https://hub.docker.com/_/maven/ +# +# For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html + +# This template will build and test your projects +# * Caches downloaded dependencies and plugins between invocation. +# * Verify but don't deploy merge requests. +# * Deploy built artifacts from master branch only. + +variables: + # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. + MAVEN_OPTS: >- + -Dhttps.protocols=TLSv1.2 + -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository + -Dorg.slf4j.simpleLogger.showDateTime=true + -Djava.awt.headless=true + + # As of Maven 3.3.0 instead of this you MAY define these options in `.mvn/maven.config` so the same config is used + # when running from the command line. + # As of Maven 3.6.1, the use of `--no-tranfer-progress` (or `-ntp`) suppresses download and upload messages. The use + # of the `Slf4jMavenTransferListener` is no longer necessary. + # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. + MAVEN_CLI_OPTS: >- + --batch-mode + --errors + --fail-at-end + --show-version + --no-transfer-progress + -DinstallAtEnd=true + -DdeployAtEnd=true + +# This template uses the latest Maven 3 release, e.g., 3.8.6, and OpenJDK 8 (LTS) +# for verifying and deploying images +# Maven 3.8.x REQUIRES HTTPS repositories. +# See https://maven.apache.org/docs/3.8.1/release-notes.html#how-to-fix-when-i-get-a-http-repository-blocked for more. +image: maven:3.8.5-openjdk-17 + +# Cache downloaded dependencies and plugins between builds. +# To keep cache across branches add 'key: "$CI_JOB_NAME"' +# Be aware that `mvn deploy` will install the built jar into this repository. If you notice your cache size +# increasing, consider adding `-Dmaven.install.skip=true` to `MAVEN_OPTS` or in `.mvn/maven.config` +cache: + paths: + - .m2/repository + +# For merge requests do not `deploy` but only run `verify`. +# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html +.verify: + stage: test + script: + - 'mvn $MAVEN_CLI_OPTS verify' + except: + variables: + - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + +# Verify merge requests using JDK8 +verify:jdk8: + extends: + - .verify + +# To deploy packages from CI, create a `ci_settings.xml` file +# For deploying packages to GitLab's Maven Repository: See https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for more details. +# Please note: The GitLab Maven Repository is currently only available in GitLab Premium / Ultimate. +# For `master` or `main` branch run `mvn deploy` automatically. +deploy:jdk8: + stage: deploy + script: + - if [ ! -f ci_settings.xml ]; then + echo "CI settings missing\! If deploying to GitLab Maven Repository, please see https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for instructions."; + fi + - 'mvn $MAVEN_CLI_OPTS deploy --settings ci_settings.xml' + only: + variables: + - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH diff --git a/ci_settings.xml b/ci_settings.xml new file mode 100644 index 0000000..6a5f365 --- /dev/null +++ b/ci_settings.xml @@ -0,0 +1,16 @@ + + + + gitlab-maven + + + + Job-Token + ${CI_JOB_TOKEN} + + + + + + -- 2.45.2 From 3e3c7a9be591da547c6750da930b221c66efe1b9 Mon Sep 17 00:00:00 2001 From: Christopher Moyer Date: Fri, 18 Aug 2023 23:22:06 +0000 Subject: [PATCH 2/4] add ci settings to pom --- .gitlab-ci.yml | 6 +++--- pom.xml | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c25f376..7138a58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,8 +59,8 @@ cache: variables: - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -# Verify merge requests using JDK8 -verify:jdk8: +# Verify merge requests using jdk17 +verify:jdk17: extends: - .verify @@ -68,7 +68,7 @@ verify:jdk8: # For deploying packages to GitLab's Maven Repository: See https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for more details. # Please note: The GitLab Maven Repository is currently only available in GitLab Premium / Ultimate. # For `master` or `main` branch run `mvn deploy` automatically. -deploy:jdk8: +deploy:jdk17: stage: deploy script: - if [ ! -f ci_settings.xml ]; then diff --git a/pom.xml b/pom.xml index 9faa2f6..5211ecc 100644 --- a/pom.xml +++ b/pom.xml @@ -124,6 +124,23 @@ + + + gitlab-maven + ${env.CI_SERVER_URL}/api/v4/projects/${env.CI_PROJECT_ID}/packages/maven + + + + + gitlab-maven + ${env.CI_SERVER_URL}/api/v4/projects/${env.CI_PROJECT_ID}/packages/maven + + + gitlab-maven + ${env.CI_SERVER_URL}/api/v4/projects/${env.CI_PROJECT_ID}/packages/maven + + + native -- 2.45.2 From 7c92de455ff9a7d12f09b2e8aea2fd6d60e03965 Mon Sep 17 00:00:00 2001 From: Christopher Moyer Date: Fri, 18 Aug 2023 23:25:57 +0000 Subject: [PATCH 3/4] deploy on all branches --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7138a58..5b04e1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,6 +75,6 @@ deploy:jdk17: echo "CI settings missing\! If deploying to GitLab Maven Repository, please see https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for instructions."; fi - 'mvn $MAVEN_CLI_OPTS deploy --settings ci_settings.xml' - only: - variables: - - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + # only: + # variables: + # - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -- 2.45.2 From ddd268a105625140ab40d2a372315c4ccc020bf4 Mon Sep 17 00:00:00 2001 From: Christopher Moyer Date: Fri, 18 Aug 2023 23:30:59 +0000 Subject: [PATCH 4/4] Update file .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b04e1e..7138a58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,6 +75,6 @@ deploy:jdk17: echo "CI settings missing\! If deploying to GitLab Maven Repository, please see https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for instructions."; fi - 'mvn $MAVEN_CLI_OPTS deploy --settings ci_settings.xml' - # only: - # variables: - # - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + only: + variables: + - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -- 2.45.2