From 004141070c7a54d55506f0cd6f2731fe0059abd1 Mon Sep 17 00:00:00 2001 From: Waschndolos Date: Tue, 9 Apr 2024 06:59:46 +0200 Subject: [PATCH] Enabling CD (#651) --- .github/dependabot.yml | 2 +- .github/release-drafter.yml | 3 --- .github/workflows/cd.yaml | 20 ++++++++++++++++++++ .github/workflows/release-drafter.yml | 17 ----------------- .mvn/maven.config | 1 + pom.xml | 5 ++--- 6 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 .github/release-drafter.yml create mode 100644 .github/workflows/cd.yaml delete mode 100644 .github/workflows/release-drafter.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f9e0d0e89..c6da28a48 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,5 +9,5 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "weekly" + interval: "monthly" open-pull-requests-limit: 10 diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index 9f47e8c1a..000000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,3 +0,0 @@ -_extends: .github -tag-template: prometheus-$NEXT_PATCH_VERSION -version-template: $MAJOR.$MINOR.$PATCH diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml new file mode 100644 index 000000000..f8cb1f8d6 --- /dev/null +++ b/.github/workflows/cd.yaml @@ -0,0 +1,20 @@ +# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins + +name: cd +on: + workflow_dispatch: +# Want to do manual releases for now until I'm used to the CD +# 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/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index 1f8a181b6..000000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Note: additional setup is required, see https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc - -name: Release Drafter - -on: - push: - branches: - - master - -jobs: - update_release_draft: - runs-on: ubuntu-latest - steps: - # Drafts your next Release notes as Pull Requests are merged into the default branch - - uses: release-drafter/release-drafter@v6 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.mvn/maven.config b/.mvn/maven.config index 2a0299c48..61cf4e5e7 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1,2 +1,3 @@ -Pconsume-incrementals -Pmight-produce-incrementals +-Dchangelist.format=%d.v%s \ No newline at end of file diff --git a/pom.xml b/pom.xml index 98565ed67..970e187b8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ prometheus - ${revision}${changelist} + ${changelist} hpi Prometheus metrics plugin Expose Jenkins metrics in prometheus format @@ -17,8 +17,7 @@ 2016 - 2.5.4 - -SNAPSHOT + 999999-SNAPSHOT jenkinsci/prometheus-plugin 2.387.3