Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revamp empty states #103

Merged
merged 8 commits into from
May 14, 2021
Merged

Revamp empty states #103

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
79d0336
Update pom
timja Jan 24, 2021
bb87f9c
Revamp empty states
timja Jan 24, 2021
814c7ac
Merge branch 'master' into revamp-empty-state
timja May 6, 2021
929888d
Bump branch-api
timja May 6, 2021
55659e3
Update src/main/resources/org/jenkinsci/plugins/workflow/multibranch/…
timja May 6, 2021
5c10ef0
Merge branch 'master' into revamp-empty-state
bitwiseman May 13, 2021
4e6abf6
Apply suggestions from code review
timja May 13, 2021
4a8accb
Update src/main/resources/org/jenkinsci/plugins/workflow/multibranch/…
timja May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
buildPlugin(useAci: true)
buildPlugin(useAci: true, configurations: [
[ platform: "linux", jdk: "8", jenkins: null ],
[ platform: "windows", jdk: "8", jenkins: null ],
[ platform: "linux", jdk: "11", jenkins: null ]
])

48 changes: 14 additions & 34 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.4</version>
<version>4.15</version>
<relativePath />
</parent>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down Expand Up @@ -66,17 +66,16 @@ THE SOFTWARE.
<revision>2.23</revision>
<changelist>-SNAPSHOT</changelist>
<java.level>8</java.level>
<jenkins.version>2.176.4</jenkins.version>
<jenkins.version>2.264</jenkins.version>
<no-test-jar>false</no-test-jar>
<workflow-job-plugin.version>2.39</workflow-job-plugin.version> <!-- TODO: Remove after https://github.com/jenkinsci/bom/pull/264 is released. -->
<subversion-plugin.version>2.13.0</subversion-plugin.version>
<subversion-plugin.version>2.14.0</subversion-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.176.x</artifactId>
<version>11</version>
<artifactId>bom-2.263.x</artifactId>
<version>21</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -90,16 +89,11 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>${workflow-job-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
Expand All @@ -111,6 +105,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>branch-api</artifactId>
<version>2.6.4-rc965.72564c761ad5</version> <!-- TODO https://github.com/jenkinsci/branch-api-plugin/pull/240 -->
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -127,6 +122,13 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<exclusions>
<!-- TODO remove after https://github.com/jenkinsci/script-security-plugin/pull/323 is released -->
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -147,7 +149,6 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps-global-lib</artifactId>
<version>2.17</version> <!-- TODO: Remove after https://github.com/jenkinsci/bom/pull/278 is released. -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -172,16 +173,6 @@ THE SOFTWARE.
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -194,16 +185,6 @@ THE SOFTWARE.
<artifactId>git</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -221,14 +202,12 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>${workflow-job-plugin.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-auth</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -256,6 +235,7 @@ THE SOFTWARE.
<loggers>
<org.jenkinsci.plugins.workflow.multibranch>FINE</org.jenkinsci.plugins.workflow.multibranch>
</loggers>
<minimumJavaVersion>1.8</minimumJavaVersion>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

package org.jenkinsci.plugins.workflow.multibranch;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.Extension;
import hudson.Functions;
import hudson.MarkupText;
Expand Down Expand Up @@ -74,6 +75,7 @@ public SCMBinder(String scriptPath) {
this.scriptPath = scriptPath;
}

@SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", justification = "spotbugs thinks that SCMFileSystem won't be null but it can be with heavy weight checkout")
@Override public FlowExecution create(FlowExecutionOwner handle, TaskListener listener, List<? extends Action> actions) throws Exception {
Queue.Executable exec = handle.getExecutable();
if (!(exec instanceof WorkflowRun)) {
Expand Down
19 changes: 19 additions & 0 deletions ...sci/plugins/workflow/multibranch/WorkflowBranchProjectFactory/getting-started-links.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?jelly escape-by-default='true'?>
<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
<li class="content-block">
<a href="https://www.jenkins.io/doc/book/pipeline/" class="content-block__link content-block__help-link">
<span>Creating a Jenkins Pipeline</span>
<span class="trailing-icon">
<l:svgIcon class="icon-sm" href="${imagesURL}/material-icons/svg-sprite-content-symbol.svg#ic_link_24px" />
</span>
</a>
</li>
<li class="content-block">
<a href="https://www.jenkins.io/doc/book/pipeline/multibranch/" class="content-block__link content-block__help-link">
<span>Creating Multibranch Projects</span>
<span class="trailing-icon">
<l:svgIcon class="icon-sm" href="${imagesURL}/material-icons/svg-sprite-content-symbol.svg#ic_link_24px" />
</span>
</a>
</li>
</st:compress>
3 changes: 0 additions & 3 deletions ...jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactory/getting-started.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,4 @@
<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
Pipeline Branch projects support building branches within a repository containing a pipeline script. Per default it uses
timja marked this conversation as resolved.
Show resolved Hide resolved
a file named <code>Jenkinsfile</code> in the root directory.
This file should contain a valid
<a target="_blank" href="https://github.com/jenkinsci/workflow-plugin/blob/master/TUTORIAL.md#understanding-flow-scripts">Jenkins Pipeline</a>. See also:
<a target="_blank" href="https://github.com/jenkinsci/workflow-plugin/blob/master/TUTORIAL.md#creating-multibranch-projects">Creating Multibranch Projects</a>.
</st:compress>
19 changes: 19 additions & 0 deletions ...lugins/workflow/multibranch/WorkflowMultiBranchProjectFactory/getting-started-links.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?jelly escape-by-default='true'?>
<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
<li class="content-block">
<a href="https://www.jenkins.io/doc/book/pipeline/" class="content-block__link content-block__help-link">
<span>Creating a Jenkins Pipeline</span>
<span class="trailing-icon">
<l:svgIcon class="icon-sm" href="${imagesURL}/material-icons/svg-sprite-content-symbol.svg#ic_link_24px" />
</span>
</a>
</li>
<li class="content-block">
<a href="https://www.jenkins.io/doc/book/pipeline/multibranch/" class="content-block__link content-block__help-link">
<span>Creating Multibranch Projects</span>
<span class="trailing-icon">
<l:svgIcon class="icon-sm" href="${imagesURL}/material-icons/svg-sprite-content-symbol.svg#ic_link_24px" />
</span>
</a>
</li>
</st:compress>
timja marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 0 additions & 3 deletions ...nsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectFactory/getting-started.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,4 @@
<?jelly escape-by-default='true'?>
<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
Pipeline Multibranch projects recognize and build repositories with a file named <code>Jenkinsfile</code> in branches of the repository.
This file should contain a valid
<a target="_blank" href="https://github.com/jenkinsci/workflow-plugin/blob/master/TUTORIAL.md#understanding-flow-scripts">Jenkins Pipeline</a>. See also:
<a target="_blank" href="https://github.com/jenkinsci/workflow-plugin/blob/master/TUTORIAL.md#creating-multibranch-projects">Creating Multibranch Projects</a>.
</st:compress>