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

Update dependency io.cucumber:ci-environment to v9 #2475

Merged
merged 2 commits into from
Jan 30, 2022
Merged

Update dependency io.cucumber:ci-environment to v9 #2475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a7ab2e
Update dependency io.cucumber:ci-environment to v9
renovate-bot Jan 26, 2022
ddfe26c
Use new ci-environment api
mpkorstanje Jan 30, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Added

### Changed
* Update dependency io.cucumber:ci-environment to v9 ([#2475](https://github.com/cucumber/cucumber-jvm/pull/2475) M.P. Korstanje)
* Update dependency io.cucumber:html-formatter to v18 ([#2476](https://github.com/cucumber/cucumber-jvm/pull/2476) M.P. Korstanje)
- Removed work around for 'Uncaught TypeError: e.git is undefined'

Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<name>Cucumber-JVM: Bill of Materials</name>

<properties>
<ci-environment.version>8.1.0</ci-environment.version>
<ci-environment.version>9.0.0</ci-environment.version>
<cucumber-expressions.version>15.0.1</cucumber-expressions.version>
<datatable.version>4.1.0</datatable.version>
<html-formatter.version>18.0.0</html-formatter.version>
Expand Down
33 changes: 11 additions & 22 deletions core/src/main/java/io/cucumber/core/runtime/CucumberExecutionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.cucumber.core.runtime;

import io.cucumber.cienvironment.CiEnvironment;
import io.cucumber.core.eventbus.EventBus;
import io.cucumber.core.gherkin.Feature;
import io.cucumber.core.logging.Logger;
Expand Down Expand Up @@ -65,27 +64,17 @@ private Meta createMeta() {
new Product(System.getProperty("java.vm.name"), System.getProperty("java.vm.version")),
new Product(System.getProperty("os.name"), null),
new Product(System.getProperty("os.arch"), null),
createCi());
}

private Ci createCi() {
CiEnvironment ciEnvironment = detectCiEnvironment(System.getenv());
if (ciEnvironment == null) {
return null;
}

return new Ci(
ciEnvironment.getName(),
ciEnvironment.getUrl(),
ciEnvironment.getBuildNumber(),
createGit(ciEnvironment.getGit()));
}

private Git createGit(CiEnvironment.Git ciGit) {
if (ciGit == null) {
return null;
}
return new Git(ciGit.getRemote(), ciGit.getRevision(), ciGit.getBranch(), ciGit.getTag());
detectCiEnvironment(System.getenv()).map(ci -> new Ci(
ci.getName(),
ci.getUrl(),
ci.getBuildNumber().orElse(null),
ci.getGit().map(git -> new Git(
git.getRemote(),
git.getRevision(),
git.getBranch().orElse(null),
git.getTag().orElse(null)))
.orElse(null)))
.orElse(null));
}

private void emitTestRunStarted() {
Expand Down