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.

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

Update jenkinsfile #114

Merged
merged 10 commits into from
Oct 29, 2023
10 changes: 2 additions & 8 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [1.8, 11]
jenkins-version: [2.138.4, 2.190.1]
java: [11]
jenkins-version: [2.361]
os: [ubuntu-latest, windows-latest]
include:
- jenkins-version: '2.190.1'
flags: '--define jenkins.version=2.190.1 --define slf4jVersion=1.7.26'
exclude:
- java: '11'
jenkins-version: '2.138.4'

steps:
- uses: actions/checkout@v1
Expand Down
6 changes: 1 addition & 5 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
#!/usr/bin/env groovy

/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
def recentLTS = "2.176.4"
def recentLTS = "2.361"
def configurations = [
[ platform: "linux", jdk: "8", jenkins: null ],
[ platform: "linux", jdk: "8", jenkins: recentLTS ],
[ platform: "linux", jdk: "11", jenkins: recentLTS ],
[ platform: "windows", jdk: "8", jenkins: null ],
[ platform: "windows", jdk: "8", jenkins: recentLTS ],
[ platform: "windows", jdk: "11", jenkins: recentLTS ],
]
buildPlugin(configurations: configurations)
11 changes: 5 additions & 6 deletions src/main/java/jenkins/plugins/accurev/AccurevTool.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,12 @@ public AccurevTool(String name, String home, List<? extends ToolProperty<?>> pro
}

private static AccurevTool[] getInstallations(DescriptorImpl descriptor) {
AccurevTool[] installations;
try {
installations = descriptor.getInstallations();
} catch (NullPointerException e) {
installations = new AccurevTool[0];

if (descriptor == null) {
return new AccurevTool[0];
} else {
return descriptor.getInstallations();
}
return installations;
}

/**
Expand Down