Skip to content

Commit dc7effb

Browse files
authored
Merge branch 'master' into dockerfile
2 parents 1cc7e49 + 129a2d7 commit dc7effb

File tree

221 files changed

+4832
-6625
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+4832
-6625
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: maven
4+
directory: /
5+
schedule:
6+
interval: monthly
7+
- package-ecosystem: github-actions
8+
directory: /
9+
schedule:
10+
interval: monthly

.github/release-drafter.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/cd.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins
2+
3+
name: cd
4+
on:
5+
workflow_dispatch:
6+
check_run:
7+
types:
8+
- completed
9+
10+
jobs:
11+
maven-cd:
12+
uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
13+
secrets:
14+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
15+
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.0-beta-4</version>
5+
<version>1.4</version>
66
</extension>
77
</extensions>

.mvn/maven.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-Pconsume-incrementals
22
-Pmight-produce-incrementals
3+
-Dchangelist.format=%d.v%s

Jenkinsfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
buildPlugin()
2-
1+
buildPlugin(platforms: [
2+
'linux',
3+
'maven-windows' // TODO Docker-based tests fail when using Docker on Windows. The maven-windows agents do not have Docker installed so tests that require Docker are skipped.
4+
])

README.md

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,7 @@ A full description is available in the plugin’s [documentation](https://go.clo
1414

1515
Demo
1616
---
17-
The plugin has a Docker-based demo. See the [demo README](demo/README.md) page for setup and launch guidelines.
18-
19-
Releasing
20-
---
21-
22-
Prior to release, edit `demo/plugins.txt` to use the snapshot version and run:
23-
24-
mvn -DskipTests clean install
25-
make -C demo run
26-
27-
and verify that the demo works.
28-
29-
After the Maven release completes, update the `docker-workflow` version in `demo/plugins.txt` to the release version and run
30-
31-
make -C demo run
32-
33-
to sanity check, then
34-
35-
make -C demo push-latest
17+
The plugin has an outdated Docker-based demo. See the [demo README from v1.12](https://github.com/jenkinsci/docker-workflow-plugin/tree/docker-workflow-1.12/demo) for setup and launch guidelines.
3618

3719
License
3820
---

demo/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

demo/Dockerfile

Lines changed: 0 additions & 60 deletions
This file was deleted.

demo/Dockerfile-registry

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)