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

Bump org.jenkins-ci:acceptance-test-harness from 5814.vdc5d6d484b_40 to 5883.vdea_99c1762a_d #1774

Merged
merged 3 commits into from
Jul 7, 2024
Merged

Bump org.jenkins-ci:acceptance-test-harness from 5814.vdc5d6d484b_40 to 5883.vdea_99c1762a_d #1774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5f93f9
Bump org.jenkins-ci:acceptance-test-harness
dependabot[bot] Jul 5, 2024
6bed058
Fix broken ATH API that exposes implementation details to the caller.
uhafner Jul 5, 2024
5233b89
Fix CheckStyle warning.
uhafner Jul 7, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
with:
maven-version: 3.9.6
- name: Generate coverage with JaCoCo
run: mvn -V --color always -ntp clean verify '-Dgpg.skip'
run: mvn -V --color always -ntp clean verify -Pci --file plugin/pom.xml
- name: Upload coverage to Codecov
uses: codecov/[email protected]
with:
files: 'target/site/jacoco/jacoco.xml'
files: 'plugin/target/site/jacoco/jacoco.xml'
token: ${{secrets.CODECOV_TOKEN}}
2 changes: 1 addition & 1 deletion .github/workflows/ui-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
with:
maven-version: 3.9.6
- name: Build warnings plugin and download dependencies
run: mvn -V --color always -ntp verify -Pskip --file plugin/pom.xml -Dgpg.skip
run: mvn -V --color always -ntp verify -Pskip --file plugin/pom.xml
- name: Run UI tests ${{ matrix.test }} on ${{ matrix.browser }}
env:
BROWSER: ${{ matrix.browser }}
Expand Down
2 changes: 1 addition & 1 deletion ui-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>acceptance-test-harness</artifactId>
<version>5814.vdc5d6d484b_40</version>
<version>5883.vdea_99c1762a_d</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
15 changes: 11 additions & 4 deletions ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/GitForensicsUiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.jenkins.plugins.analysis.warnings;

import java.io.IOException;
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
Expand Down Expand Up @@ -37,6 +38,7 @@
@WithPlugins({"git", "git-forensics"})
@WithCredentials(credentialType = WithCredentials.SSH_USERNAME_PRIVATE_KEY, values = {"gitplugin", "/org/jenkinsci/test/acceptance/docker/fixtures/GitContainer/unsafe"})
@SuppressFBWarnings("BC")
@SuppressWarnings("checkstyle:ClassFanOutComplexity")
public class GitForensicsUiTest extends UiTest {
@Inject
@SuppressWarnings("CdiInjectionPointsInspection")
Expand Down Expand Up @@ -110,10 +112,15 @@ private Map<String, String> commitDifferentFilesToGitRepository(final GitRepo re
@SuppressFBWarnings("BC_UNCONFIRMED_CAST_OF_RETURN_VALUE")
@SuppressWarnings("PMD.CloseResource")
public void initGitRepository() {
GitContainer gitContainer = gitServer.get();
repoUrl = gitContainer.getRepoUrl();
host = gitContainer.host();
port = gitContainer.port();
try {
GitContainer gitContainer = gitServer.get();
repoUrl = gitContainer.getRepoUrl();
host = gitContainer.host();
port = gitContainer.port();
}
catch (MalformedURLException exception) {
throw new AssertionError("Could not initialize GitContainer", exception);
}
}

/** Dispose the docker container. */
Expand Down