Skip to content

Commit

Permalink
Merge pull request #88 from NotMyFault/fix/master/cd
Browse files Browse the repository at this point in the history
Update CD setup
  • Loading branch information
guysoft authored Mar 1, 2022
2 parents afae69f + d20c2e7 commit 9663575
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 24 deletions.
2 changes: 0 additions & 2 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
_extends: .github
tag-template: $NEXT_PATCH_VERSION
version-template: $MAJOR.$MINOR.$PATCH
6 changes: 3 additions & 3 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/[email protected]
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/release-drafter.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.2</version>
<version>1.3</version>
</extension>
</extensions>
1 change: 1 addition & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-Pconsume-incrementals
-Pmight-produce-incrementals
-Dchangelist.format=%d.v%s
7 changes: 3 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>
<artifactId>configurationslicing</artifactId>
<packaging>hpi</packaging>
<version>${revision}${changelist}</version>
<version>${changelist}</version>
<name>Configuration Slicing plugin</name>
<description>Allows configuration of a single property across a group of projects</description>
<url>https://github.com/jenkinsci/configurationslicing-plugin</url>
Expand All @@ -27,13 +27,12 @@
</developer>
</developers>
<properties>
<revision>1.53</revision>
<changelist>-SNAPSHOT</changelist>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/configurationslicing-plugin</gitHubRepo>
<findbugs.failOnError>false</findbugs.failOnError>
<spotbugs.failOnError>false</spotbugs.failOnError>
<java.level>8</java.level>
<jenkins.version>2.289.1</jenkins.version>
<jenkins.version>2.289.3</jenkins.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down

0 comments on commit 9663575

Please sign in to comment.