From 97aa219236fa4fcffccbdffe620714c499db090b Mon Sep 17 00:00:00 2001 From: JFronny Date: Thu, 3 Nov 2022 15:20:24 +0100 Subject: [PATCH] Set up self-hosted --- .gitlab-ci.yml | 20 -------------------- .woodpecker.yml | 11 +++++++++++ README.md | 2 +- ci_settings.xml | 12 +++--------- pom.xml | 12 ++++++------ 5 files changed, 21 insertions(+), 36 deletions(-) delete mode 100644 .gitlab-ci.yml create mode 100644 .woodpecker.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 3d8661a7..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,20 +0,0 @@ -variables: - MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" - MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" - -image: maven:3-openjdk-17 - -cache: - paths: - - .m2/repository - -deploy: - 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 -s ci_settings.xml' - only: - variables: - - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 00000000..caa85133 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,11 @@ +pipeline: + maven: + image: maven:3-openjdk-17 + environment: + - MAVEN_OPTS=-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true + - MAVEN_CLI_OPTS=--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true + commands: + - mvn $MAVEN_CLI_OPTS deploy -s ci_settings.xml + secrets: [ maven_token, maven_name ] + when: + - branch: master \ No newline at end of file diff --git a/README.md b/README.md index 54598ec9..2037d405 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Please be aware that I also increased the minimum java version to 11 To use this, add the following: ```groovy maven { - url = 'https://gitlab.com/api/v4/projects/35030495/packages/maven' + url = 'https://maven.frohnmeyer-wds.de/artifacts/' } dependencies { diff --git a/ci_settings.xml b/ci_settings.xml index da49fc0f..718dd787 100644 --- a/ci_settings.xml +++ b/ci_settings.xml @@ -2,15 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"> - gitlab-maven - - - - Job-Token - ${CI_JOB_TOKEN} - - - + jf-maven + ${MAVEN_NAME} + ${MAVEN_TOKEN} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 48571084..869c02b3 100644 --- a/pom.xml +++ b/pom.xml @@ -53,18 +53,18 @@ - gitlab-maven - ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + jf-maven + https://maven.frohnmeyer-wds.de/artifacts - gitlab-maven - ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + jf-maven + https://maven.frohnmeyer-wds.de/artifacts - gitlab-maven - ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + jf-maven + https://maven.frohnmeyer-wds.de/artifacts