From 706b01c00b98288b78bd893197b1495f85d91947 Mon Sep 17 00:00:00 2001 From: Baptiste Mathus Date: Tue, 8 Feb 2022 09:57:42 +0100 Subject: [PATCH 1/2] Enable CD See https://www.jenkins.io/doc/developer/publishing/releasing-cd/ --- .github/dependabot.yml | 4 +++ .github/release-drafter.yml | 1 - .github/workflows/cd.yaml | 59 +++++++++++++++++++++++++++++++++ .github/workflows/changelog.yml | 16 --------- .mvn/extensions.xml | 7 ++++ .mvn/maven.config | 3 ++ pom.xml | 18 ++++++---- 7 files changed, 84 insertions(+), 24 deletions(-) create mode 100644 .github/workflows/cd.yaml delete mode 100644 .github/workflows/changelog.yml create mode 100644 .mvn/extensions.xml create mode 100644 .mvn/maven.config diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 04ceb6e..57e1005 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,3 +4,7 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index ef769f4..0d0b1c9 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,2 +1 @@ _extends: .github -tag-template: javadoc-$NEXT_MINOR_VERSION diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml new file mode 100644 index 0000000..62b824d --- /dev/null +++ b/.github/workflows/cd.yaml @@ -0,0 +1,59 @@ +# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins + +name: cd +on: + workflow_dispatch: + check_run: + types: + - completed + +jobs: + validate: + runs-on: ubuntu-latest + outputs: + should_release: ${{ steps.verify-ci-status.outputs.result == 'success' && steps.interesting-categories.outputs.interesting == 'true' }} + steps: + - name: Verify CI status + uses: jenkins-infra/verify-ci-status-action@v1.2.0 + id: verify-ci-status + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + output_result: true + + - name: Release Drafter + uses: release-drafter/release-drafter@v5 + if: steps.verify-ci-status.outputs.result == 'success' + with: + name: next + tag: next + version: next + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Check interesting categories + uses: jenkins-infra/interesting-category-action@v1.0.0 + id: interesting-categories + if: steps.verify-ci-status.outputs.result == 'success' + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + release: + runs-on: ubuntu-latest + needs: [validate] + if: needs.validate.outputs.should_release == 'true' + steps: + - name: Check out + uses: actions/checkout@v2.4.0 + with: + fetch-depth: 0 + - name: Set up JDK 8 + uses: actions/setup-java@v2.5.0 + with: + distribution: temurin + java-version: 8 + - name: Release + uses: jenkins-infra/jenkins-maven-cd-action@v1.2.0 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }} diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml deleted file mode 100644 index 84ef368..0000000 --- a/.github/workflows/changelog.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Automates creation of Release Drafts using Release Drafter -# More Info: https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc - -on: - push: - branches: - - master - -jobs: - update_release_draft: - runs-on: ubuntu-latest - steps: - # Drafts your next Release notes as Pull Requests are merged into "master" - - uses: release-drafter/release-drafter@v5.11.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000..a65d82e --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,7 @@ + + + io.jenkins.tools.incrementals + git-changelist-maven-extension + 1.3 + + diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..f7daf60 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,3 @@ +-Pconsume-incrementals +-Pmight-produce-incrementals +-Dchangelist.format=%d.v%s diff --git a/pom.xml b/pom.xml index 3695800..fbdb2b4 100644 --- a/pom.xml +++ b/pom.xml @@ -8,22 +8,26 @@ javadoc - 1.7-SNAPSHOT + ${changelist} hpi Javadoc Plugin https://github.com/jenkinsci/${project.artifactId}-plugin - scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git - scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git - HEAD + scm:git:git://github.com/${gitHubRepo}.git + scm:git:git@github.com:${gitHubRepo}.git + https://github.com/${gitHubRepo} + ${scmTag} - + + 999999-SNAPSHOT + jenkinsci/javadoc-plugin 2.249.x 2.249.3 8 + jenkinsci/javadoc-plugin @@ -76,7 +80,7 @@ https://repo.jenkins-ci.org/public/ - + The MIT license @@ -91,5 +95,5 @@ https://repo.jenkins-ci.org/public/ - + From adf2ff1382ec031a2830708298d7672a0658b1e0 Mon Sep 17 00:00:00 2001 From: Baptiste Mathus Date: Tue, 8 Feb 2022 10:49:54 +0100 Subject: [PATCH 2/2] Remove duplicate property :facepalm: Thanks Tim Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index fbdb2b4..5030f34 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,6 @@ 2.249.x 2.249.3 8 - jenkinsci/javadoc-plugin