Skip to content

misc: Replacing LayerCI references with webapp.io (finishing previous PR) #28874

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

Merged
merged 6 commits into from
Feb 19, 2024
Merged

misc: Replacing LayerCI references with webapp.io (finishing previous PR) #28874

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae2bdb1
Replacing LayerCI references with webapp.io
joshuadsouza Feb 6, 2024
5ee14a1
Update CI params exposed from webapp.io and add EXPOSE_WEBSITE_HOST
joshuadsouza Feb 6, 2024
8d12bbd
Adding misc to changelog references changes from LayerCI to webappio
joshuadsouza Feb 6, 2024
b8e9b7f
Removing EXPOSE_WEBSITE_HOST
joshuadsouza Feb 6, 2024
1b4d8d1
Merge branch 'develop' into develop
jennifer-shehane Feb 15, 2024
8552273
Merge branch 'develop' into develop
jennifer-shehane Feb 19, 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
1 change: 1 addition & 0 deletions cli/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ _Released 2/13/2024 (PENDING)_
**Misc:**

- Improved accessibility of the Cypress App in some areas. Addressed in [#28774](https://github.com/cypress-io/cypress/pull/28774).
- Changed references of LayerCI to webapp.io. Addressed in [#28874](https://github.com/cypress-io/cypress/pull/28874).

## 13.6.4

Expand Down
2 changes: 1 addition & 1 deletion packages/errors/__snapshot-html__/INDETERMINATE_CI_BUILD_ID.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/server/__snapshots__/cypress_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ The ciBuildId is automatically detected if you are running Cypress in any of the
- teamfoundation
- travis
- netlify
- layerci
- webappio

Because the ciBuildId could not be auto-detected you must pass the --ci-build-id flag manually.

Expand Down Expand Up @@ -118,7 +118,7 @@ The ciBuildId is automatically detected if you are running Cypress in any of the
- teamfoundation
- travis
- netlify
- layerci
- webappio

Because the ciBuildId could not be auto-detected you must pass the --ci-build-id flag manually.

Expand Down Expand Up @@ -157,7 +157,7 @@ The ciBuildId is automatically detected if you are running Cypress in any of the
- teamfoundation
- travis
- netlify
- layerci
- webappio

Because the ciBuildId could not be auto-detected you must pass the --ci-build-id flag manually.

Expand Down
23 changes: 12 additions & 11 deletions packages/server/lib/util/ci_provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const CI_PROVIDERS = {
'travis': 'TRAVIS',
'wercker': isWercker,
netlify: 'NETLIFY',
layerci: 'LAYERCI',
webappio: 'WEBAPPIO',
}

const _detectProviderName = () => {
Expand Down Expand Up @@ -418,16 +418,17 @@ const _providerCiParams = () => {
'DEPLOY_PRIME_URL',
'DEPLOY_ID',
]),
// https://layerci.com/docs/layerfile-reference/build-env
layerci: extract([
'LAYERCI_JOB_ID',
'LAYERCI_RUNNER_ID',
// https://docs.webapp.io/layerfile-reference/build-env
webappio: extract([
'JOB_ID',
'RUNNER_ID',
'RETRY_INDEX',
'LAYERCI_PULL_REQUEST',
'LAYERCI_REPO_NAME',
'LAYERCI_REPO_OWNER',
'LAYERCI_BRANCH',
'PULL_REQUEST_URL',
'REPOSITORY_NAME',
'REPOSITORY_OWNER',
'GIT_BRANCH',
'GIT_TAG', // short hex for commits
'EXPOSE_WEBSITE_HOST',
]),
}
}
Expand Down Expand Up @@ -621,9 +622,9 @@ const _providerCommitParams = () => {
branch: env.BRANCH,
remoteOrigin: env.REPOSITORY_URL,
},
layerci: {
webappio: {
sha: env.GIT_COMMIT,
branch: env.LAYERCI_BRANCH,
branch: env.GIT_BRANCH,
message: env.GIT_COMMIT_TITLE,
},
}
Expand Down
32 changes: 17 additions & 15 deletions packages/server/test/unit/util/ci_provider_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,34 +1088,36 @@ describe('lib/util/ci_provider', () => {
})
})

it('layerci', () => {
it('webappio', () => {
resetEnv = mockedEnv({
LAYERCI: 'true',
WEBAPPIO: 'true',

LAYERCI_JOB_ID: 'jobId',
LAYERCI_RUNNER_ID: 'runnerId',
JOB_ID: 'jobId',
RUNNER_ID: 'runnerId',
RETRY_INDEX: 'retryIndex',
EXPOSE_WEBSITE_HOST: 'exposeWebsiteHost',

// git info
LAYERCI_PULL_REQUEST: 'pullRequest',
LAYERCI_REPO_NAME: 'repoName',
LAYERCI_REPO_OWNER: 'repoOwner',
LAYERCI_BRANCH: 'branch',
PULL_REQUEST_URL: 'pullRequest',
REPOSITORY_NAME: 'repoName',
REPOSITORY_OWNER: 'repoOwner',
GIT_BRANCH: 'branch',
GIT_TAG: 'tag',
GIT_COMMIT: 'commit',
GIT_COMMIT_TITLE: 'commitTitle',
}, { clear: true })

expectsName('layerci')
expectsName('webappio')
expectsCiParams({
layerciJobId: 'jobId',
layerciRunnerId: 'runnerId',
jobId: 'jobId',
runnerId: 'runnerId',
retryIndex: 'retryIndex',
gitTag: 'tag',
layerciBranch: 'branch',
layerciPullRequest: 'pullRequest',
layerciRepoName: 'repoName',
layerciRepoOwner: 'repoOwner',
gitBranch: 'branch',
pullRequestUrl: 'pullRequest',
repositoryName: 'repoName',
repositoryOwner: 'repoOwner',
exposeWebsiteHost: 'exposeWebsiteHost',
})

return expectsCommitParams({
Expand Down