From 0f7162015494a7e777172ef879c90e13e076d871 Mon Sep 17 00:00:00 2001 From: Michael Doubez Date: Fri, 15 Mar 2024 12:13:29 +0100 Subject: [PATCH 1/2] Setup fully automated versioning CD --- .github/dependabot.yml | 4 ++++ .github/release-drafter.yml | 2 -- .github/workflows/cd.yaml | 19 +++++++++++++++++++ .mvn/maven.config | 1 + pom.xml | 6 +++--- 5 files changed, 27 insertions(+), 5 deletions(-) delete mode 100644 .github/release-drafter.yml create mode 100644 .github/workflows/cd.yaml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8b642fd..eb13eef 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,3 +14,7 @@ updates: # Checkstyle >=10 requires Java 11+ - dependency-name: "com.puppycrawl.tools:checkstyle" versions: [">= 10.0"] +- package-ecosystem: github-actions + directory: / + schedule: + interval: monthly diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index 7e883f7..0000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,2 +0,0 @@ -_extends: .github -tag-template: oic-auth-$NEXT_MINOR_VERSION diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml new file mode 100644 index 0000000..f371773 --- /dev/null +++ b/.github/workflows/cd.yaml @@ -0,0 +1,19 @@ +# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins + +name: cd +on: + workflow_dispatch: + check_run: + types: + - completed + +permissions: + checks: read + contents: write + +jobs: + maven-cd: + uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1 + secrets: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }} diff --git a/.mvn/maven.config b/.mvn/maven.config index 2a0299c..f7daf60 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1,2 +1,3 @@ -Pconsume-incrementals -Pmight-produce-incrementals +-Dchangelist.format=%d.v%s diff --git a/pom.xml b/pom.xml index de5d99a..6c0e6cc 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,8 @@ - 3.1 - -SNAPSHOT + 3 + 999999-SNAPSHOT jenkinsci/oic-auth-plugin 2.361 true @@ -18,7 +18,7 @@ oic-auth - ${revision}${changelist} + ${revision}.${changelist} hpi From db16a38380f3f93b08078d1a56da4ed781f79375 Mon Sep 17 00:00:00 2001 From: Michael DOUBEZ Date: Sun, 17 Mar 2024 19:37:11 +0100 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Alexander Brandes --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c0e6cc..ecbe914 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ - 3 + 4 999999-SNAPSHOT jenkinsci/oic-auth-plugin 2.361