Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.

Commit 5e9e38e

Browse files
authored
Merge pull request #411 from jenkinsci/master
Bring release process update related changes from jenkinsci master to MW master
2 parents 1b05f1f + caeb87c commit 5e9e38e

File tree

8 files changed

+88
-8
lines changed

8 files changed

+88
-8
lines changed

.github/dependabot.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates
2+
---
3+
version: 2
4+
updates:
5+
- package-ecosystem: maven
6+
directory: /
7+
schedule:
8+
interval: monthly
9+
- package-ecosystem: github-actions
10+
directory: /
11+
schedule:
12+
interval: monthly

.github/workflows/cd.yaml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins
2+
#
3+
# Please find additional hints for individual trigger use case
4+
# configuration options inline this script below.
5+
#
6+
---
7+
name: cd
8+
on:
9+
workflow_dispatch:
10+
inputs:
11+
validate_only:
12+
required: false
13+
type: boolean
14+
description: |
15+
Run validation with release drafter only
16+
→ Skip the release job
17+
# Note: Change this default to true,
18+
# if the checkbox should be checked by default.
19+
default: false
20+
###### Opting for manual release trigger so commented check_run trigger
21+
# If you don't want any automatic trigger in general, then
22+
# the following check_run trigger lines should all be commented.
23+
# Note: Consider the use case #2 config for 'validate_only' below
24+
# as an alternative option!
25+
# check_run:
26+
# types:
27+
# - completed
28+
29+
permissions:
30+
checks: read
31+
contents: write
32+
33+
jobs:
34+
maven-cd:
35+
uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
36+
with:
37+
###### Opting for a manual release trigger so updated validate_only accordingly
38+
# Comment / uncomment the validate_only config appropriate to your preference:
39+
#
40+
# Use case #1 (automatic release):
41+
# - Let any successful Jenkins build trigger another release,
42+
# if there are merged pull requests of interest
43+
# - Perform a validation only run with drafting a release note,
44+
# if manually triggered AND inputs.validate_only has been checked.
45+
#
46+
# validate_only: ${{ inputs.validate_only == true }}
47+
#
48+
# Alternative use case #2 (no automatic release):
49+
# - Same as use case #1 - but:
50+
# - Let any check_run trigger a validate_only run.
51+
# => enforce the release job to be skipped.
52+
#
53+
validate_only: ${{ inputs.validate_only == true || github.event_name == 'check_run' }}
54+
secrets:
55+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
56+
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}

.mvn/extensions.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<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">
2+
<extension>
3+
<groupId>io.jenkins.tools.incrementals</groupId>
4+
<artifactId>git-changelist-maven-extension</artifactId>
5+
<version>1.8</version>
6+
</extension>
7+
</extensions>

.mvn/maven.config

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-Pconsume-incrementals
2+
-Pmight-produce-incrementals
3+
-Dchangelist.format=%d.v%s

pom.xml

+7-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010

1111
<artifactId>matlab</artifactId>
12-
<version> 2.16.1-SNAPSHOT</version>
12+
<version>${changelist}</version>
1313
<packaging>hpi</packaging>
1414

1515
<name>MATLAB Plugin</name>
@@ -46,13 +46,15 @@
4646
</pluginRepositories>
4747

4848
<scm>
49-
<connection>scm:git:ssh://github.com/jenkinsci/matlab-plugin.git</connection>
50-
<developerConnection>scm:git:ssh://[email protected]/jenkinsci/matlab-plugin.git</developerConnection>
51-
<url>https://github.com/jenkinsci/matlab-plugin</url>
52-
<tag>HEAD</tag>
49+
<connection>scm:git:ssh://github.com/${gitHubRepo}.git</connection>
50+
<developerConnection>scm:git:ssh://[email protected]/${gitHubRepo}.git</developerConnection>
51+
<url>https://github.com/${gitHubRepo}</url>
52+
<tag>${scmTag}</tag>
5353
</scm>
5454

5555
<properties>
56+
<changelist>999999-SNAPSHOT</changelist>
57+
<gitHubRepo>jenkinsci/matlab-plugin</gitHubRepo>
5658
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
5759
<jenkins.baseline>2.387</jenkins.baseline>
5860
<jenkins.version>${jenkins.baseline}.3</jenkins.version>

src/test/java/integ/com/mathworks/ci/RunMatlabBuildBuilderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ public void verifyDefaultMatlabNotPicked() throws Exception {
326326
* Path.
327327
*
328328
*/
329-
@Test
329+
// Disabling test as it is flaky
330330
public void verifyMatrixBuildFails() throws Exception {
331331
MatrixProject matrixProject = jenkins.createProject(MatrixProject.class);
332332
Axis axes = new Axis("VERSION", "R2018a", "R2015b");

src/test/java/integ/com/mathworks/ci/RunMatlabCommandBuilderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public void verifyDefaultMatlabNotPicked() throws Exception {
327327
* Path.
328328
*
329329
*/
330-
@Test
330+
// Disabling this as it is a flaky test
331331
public void verifyMatrixBuildFails() throws Exception {
332332
MatrixProject matrixProject = jenkins.createProject(MatrixProject.class);
333333
Axis axes = new Axis("VERSION", "R2018a", "R2015b");

src/test/java/integ/com/mathworks/ci/RunMatlabTestsBuilderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ public void verifyDefaultMatlabNotPicked() throws Exception {
427427
* Path.
428428
*
429429
*/
430-
@Test
430+
// Disabling test as it is flaky
431431
public void verifyMatrixBuildFails() throws Exception {
432432
MatrixProject matrixProject = jenkins.createProject(MatrixProject.class);
433433
Axis axes = new Axis("VERSION", "R2018a", "R2015b");

0 commit comments

Comments
 (0)