Skip to content

Commit 30be70f

Browse files
authored
chore: use new ci-environment package instead of create-meta (#1868)
* install lib * WIP * bump other cucumber deps * finish impl * add changelog * redundant comment * update library, simplify mapping * simplify again * update changelog
1 parent 1181ae6 commit 30be70f

File tree

4 files changed

+50
-33
lines changed

4 files changed

+50
-33
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
88
Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md) on how to contribute to Cucumber.
99

1010
## [Unreleased]
11+
### Changed
12+
- Switched to new `@cucumber/ci-environment` library for CI detection ([#1868](https://github.com/cucumber/cucumber-js/pull/1868))
13+
1114
### Fixed
1215
- Handles spaces in paths for developers working on cucumbers's own code ([#1845](https://github.com/cucumber/cucumber-js/issues/1845))
1316
- Ensure package.json can be imported by consuming projects

package-lock.json

Lines changed: 17 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,13 @@
184184
},
185185
"dependencies": {
186186
"@cspotcode/source-map-support": "^0.7.0",
187-
"@cucumber/create-meta": "6.0.4",
188-
"@cucumber/cucumber-expressions": "^14.0.0",
189-
"@cucumber/gherkin": "^22.0.0",
190-
"@cucumber/gherkin-streams": "^4.0.0",
191-
"@cucumber/html-formatter": "^17.0.0",
192-
"@cucumber/messages": "^17.1.1",
193-
"@cucumber/tag-expressions": "^4.1.0",
187+
"@cucumber/ci-environment": "8.0.0",
188+
"@cucumber/cucumber-expressions": "14.0.0",
189+
"@cucumber/gherkin": "22.0.0",
190+
"@cucumber/gherkin-streams": "4.0.0",
191+
"@cucumber/html-formatter": "17.0.0",
192+
"@cucumber/messages": "17.1.1",
193+
"@cucumber/tag-expressions": "4.1.0",
194194
"assertion-error-formatter": "^3.0.0",
195195
"capital-case": "^1.0.4",
196196
"cli-table3": "^0.6.0",

src/cli/helpers.ts

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import { EventDataCollector } from '../formatter/helpers'
77
import { doesHaveValue } from '../value_checker'
88
import OptionSplitter from './option_splitter'
99
import { Readable } from 'stream'
10-
import { IdGenerator } from '@cucumber/messages'
10+
import os from 'os'
1111
import * as messages from '@cucumber/messages'
12-
import createMeta from '@cucumber/create-meta'
12+
import { IdGenerator } from '@cucumber/messages'
13+
import detectCiEnvironment from '@cucumber/ci-environment'
1314
import { ISupportCodeLibrary } from '../support_code_library_builder/types'
1415
import TestCaseHookDefinition from '../models/test_case_hook_definition'
1516
import TestRunHookDefinition from '../models/test_run_hook_definition'
@@ -118,8 +119,27 @@ export async function emitMetaMessage(
118119
eventBroadcaster: EventEmitter,
119120
env: NodeJS.ProcessEnv
120121
): Promise<void> {
122+
const meta: messages.Meta = {
123+
protocolVersion: messages.version,
124+
implementation: {
125+
version,
126+
name: 'cucumber-js',
127+
},
128+
cpu: {
129+
name: os.arch(),
130+
},
131+
os: {
132+
name: os.platform(),
133+
version: os.release(),
134+
},
135+
runtime: {
136+
name: 'node.js',
137+
version: process.versions.node,
138+
},
139+
ci: detectCiEnvironment(env),
140+
}
121141
eventBroadcaster.emit('envelope', {
122-
meta: createMeta('cucumber-js', version, env),
142+
meta,
123143
})
124144
}
125145

0 commit comments

Comments
 (0)