Skip to content

Commit

Permalink
Merge pull request #44 from jglick/cd
Browse files Browse the repository at this point in the history
Enable CD
  • Loading branch information
jglick authored Sep 21, 2022
2 parents 9f050c8 + 82e12b3 commit 12f007a
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 25 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: maven
directory: /
schedule:
interval: monthly
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
2 changes: 0 additions & 2 deletions .github/release-drafter.yml

This file was deleted.

15 changes: 15 additions & 0 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# 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:
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 }}
17 changes: 0 additions & 17 deletions .github/workflows/release-drafter.yml

This file was deleted.

7 changes: 7 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.4</version>
</extension>
</extensions>
3 changes: 3 additions & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-Pconsume-incrementals
-Pmight-produce-incrementals
-Dchangelist.format=%d.v%s
3 changes: 2 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pipeline {
options {
disableConcurrentBuilds abortPrevious: true
buildDiscarder(logRotator(numToKeepStr: '20'))
timeout(time: 1, unit: 'HOURS')
}
Expand All @@ -14,7 +15,7 @@ pipeline {
stages {
stage('main') {
steps {
sh 'mvn -B clean verify -Dmaven.test.failure.ignore'
sh 'mvn -B -ntp clean verify -Dmaven.test.failure.ignore'
}
post {
success {
Expand Down
12 changes: 7 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>
<groupId>org.jenkins-ci.test</groupId>
<artifactId>docker-fixtures</artifactId>
<version>1.13-SNAPSHOT</version>
<version>${changelist}</version>
<name>Docker Fixtures</name>
<description>Docker rule for JUnit.</description>
<repositories>
Expand All @@ -31,10 +31,10 @@
</license>
</licenses>
<scm>
<connection>scm:git:https://github.com/jenkinsci/docker-fixtures.git</connection>
<developerConnection>scm:git:git://git@github.com/jenkinsci/docker-fixtures.git</developerConnection>
<url>https://github.com/jenkinsci/docker-fixtures</url>
<tag>HEAD</tag>
<connection>scm:git:https://github.com/${gitHubRepo}</connection>
<developerConnection>scm:git:https://github.com/${gitHubRepo}</developerConnection>
<url>https://github.com/${gitHubRepo}</url>
<tag>${scmTag}</tag>
</scm>
<build>
<plugins>
Expand All @@ -50,6 +50,8 @@
</plugins>
</build>
<properties>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/docker-fixtures</gitHubRepo>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spotbugs.failOnError>false</spotbugs.failOnError> <!-- TODO -->
</properties>
Expand Down

0 comments on commit 12f007a

Please sign in to comment.