From 027ced0c0f05da1335f62e5933cdb6cecdbb2ae3 Mon Sep 17 00:00:00 2001 From: Vishal Wagh Date: Thu, 20 Jun 2024 17:19:39 +0530 Subject: [PATCH 1/3] Enabled CD --- .github/dependabot.yml | 12 ++++++++++++ .github/release-drafter.yml | 2 -- .github/workflows/cd.yaml | 19 +++++++++++++++++++ .github/workflows/release-drafter.yml | 22 ---------------------- .mvn/maven.config | 1 + pom.xml | 2 +- 6 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 .github/dependabot.yml 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 new file mode 100644 index 0000000..03b4d66 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates + +version: 2 +updates: +- package-ecosystem: maven + directory: / + schedule: + interval: monthly +- 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 ef67ef4..0000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,2 +0,0 @@ -# Extends the default ReleaseDrafter config provided in https://github.com/jenkinsci/.github -_extends: .github 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/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index 864fc60..0000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Automates creation of Release Drafts using Release Drafter -# More Info: https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc -name: Release Drafter - -on: - push: - branches: - - main - tags: - - '*' - -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@v6 - with: - # Publishes a new GH Release automatically once a tag gets pushed - publish: startsWith(github.ref, "refs/tags") - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_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 5fac2d8..db2a690 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.jenkins.plugins apache-httpcomponents-client-5-api - ${revision}${changelist} + ${revision}-${changelist} hpi Apache HttpComponents Client 5.x API Plugin From c348171a76b41eae0fb3e1fbfb3f346603cfef04 Mon Sep 17 00:00:00 2001 From: Vishal Wagh Date: Thu, 20 Jun 2024 17:19:39 +0530 Subject: [PATCH 2/3] Enabled CD --- .github/dependabot.yml | 12 ++++++++++++ .github/release-drafter.yml | 2 -- .github/workflows/cd.yaml | 19 +++++++++++++++++++ .github/workflows/release-drafter.yml | 22 ---------------------- .mvn/maven.config | 1 + pom.xml | 4 ++-- 6 files changed, 34 insertions(+), 26 deletions(-) create mode 100644 .github/dependabot.yml 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 new file mode 100644 index 0000000..03b4d66 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates + +version: 2 +updates: +- package-ecosystem: maven + directory: / + schedule: + interval: monthly +- 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 ef67ef4..0000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,2 +0,0 @@ -# Extends the default ReleaseDrafter config provided in https://github.com/jenkinsci/.github -_extends: .github 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/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index 864fc60..0000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Automates creation of Release Drafts using Release Drafter -# More Info: https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc -name: Release Drafter - -on: - push: - branches: - - main - tags: - - '*' - -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@v6 - with: - # Publishes a new GH Release automatically once a tag gets pushed - publish: startsWith(github.ref, "refs/tags") - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_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 5fac2d8..37ee7c7 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ io.jenkins.plugins apache-httpcomponents-client-5-api - ${revision}${changelist} + ${revision}-${changelist} hpi Apache HttpComponents Client 5.x API Plugin @@ -47,7 +47,7 @@ 5.2.4 2.361.4 ${httpclient.version} - -999999-SNAPSHOT + 999999-SNAPSHOT false From ff7c2e3f4f002cff4d3eca55646fc3b9d6465547 Mon Sep 17 00:00:00 2001 From: Vishal Wagh Date: Fri, 21 Jun 2024 17:36:18 +0530 Subject: [PATCH 3/3] Removed a dependabot as renovate bot already present --- .github/dependabot.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 03b4d66..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,12 +0,0 @@ -# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates - -version: 2 -updates: -- package-ecosystem: maven - directory: / - schedule: - interval: monthly -- package-ecosystem: github-actions - directory: / - schedule: - interval: monthly