From d20c2e798c2b741b6139a929cc30fb70250391e8 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Tue, 1 Mar 2022 18:32:07 +0100 Subject: [PATCH] fix: Update CD --- .github/release-drafter.yml | 2 -- .github/workflows/cd.yaml | 6 +++--- .github/workflows/release-drafter.yml | 14 -------------- .mvn/extensions.xml | 2 +- .mvn/maven.config | 1 + pom.xml | 7 +++---- 6 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 .github/workflows/release-drafter.yml diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 4c01467..733bbc4 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,3 +1 @@ _extends: .github -tag-template: $NEXT_PATCH_VERSION -version-template: $MAJOR.$MINOR.$PATCH diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index c34c0fe..a27ae0d 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -19,7 +19,7 @@ jobs: output_result: true - name: Release Drafter - uses: release-drafter/release-drafter@v5 + uses: release-drafter/release-drafter@v5.18.1 if: steps.verify-ci-status.outputs.result == 'success' with: name: next @@ -45,9 +45,9 @@ jobs: with: fetch-depth: 0 - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 8 - name: Release uses: jenkins-infra/jenkins-maven-cd-action@v1.2.0 diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index 02f78b5..0000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Release Drafter - -on: - push: - branches: - - master - -jobs: - update_release_draft: - runs-on: ubuntu-latest - steps: - - uses: release-drafter/release-drafter@v5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 43d6281..a65d82e 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -2,6 +2,6 @@ io.jenkins.tools.incrementals git-changelist-maven-extension - 1.2 + 1.3 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 9f195b9..57a249c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ configurationslicing hpi - ${revision}${changelist} + ${changelist} Configuration Slicing plugin Allows configuration of a single property across a group of projects https://github.com/jenkinsci/configurationslicing-plugin @@ -27,13 +27,12 @@ - 1.53 - -SNAPSHOT + 999999-SNAPSHOT jenkinsci/configurationslicing-plugin false false 8 - 2.289.1 + 2.289.3