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

Jump to bottom

misc: Replace LayerCI reference with Webapp.io #28577

Closed
wants to merge 3 commits into from
Closed

misc: Replace LayerCI reference with Webapp.io #28577

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
deed994
Replace LayerCI with Webapp.io
Dec 22, 2023
5442046
Merge branch 'develop' into develop
emilyrohrbough Dec 28, 2023
03eea95
Merge branch 'develop' into develop
jennifer-shehane Jan 12, 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
12 changes: 6 additions & 6 deletions 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.

20 changes: 10 additions & 10 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 Expand Up @@ -334,23 +334,23 @@ exports['Long Cypress Cloud URL'] = `


────────────────────────────────────────────────────────────────────────────────────────────────────

Running: app.cy.js (1 of 1)

====================================================================================================

(Run Finished)


Spec Tests Passing Failing Pending Skipped
Spec Tests Passing Failing Pending Skipped
┌────────────────────────────────────────────────────────────────────────────────────────────────┐
│ ✖ XX:XX 1 2 3 4 5 │
└────────────────────────────────────────────────────────────────────────────────────────────────┘
✖ 1 of 1 failed (100%) XX:XX 1 2 3 4 5
✖ 1 of 1 failed (100%) XX:XX 1 2 3 4 5


───────────────────────────────────────────────────────────────────────────────────────────────────────

Recorded Run: http://cloud.cypress.io/this-is-a-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-long-url

`
Expand All @@ -370,7 +370,7 @@ exports['CLOUD_RECOMMENDATION_MESSAGE'] = `


────────────────────────────────────────────────────────────────────────────────────────────────────

Running: test1.js (1 of 1)

(Results)
Expand All @@ -393,11 +393,11 @@ exports['CLOUD_RECOMMENDATION_MESSAGE'] = `
(Run Finished)


Spec Tests Passing Failing Pending Skipped
Spec Tests Passing Failing Pending Skipped
┌────────────────────────────────────────────────────────────────────────────────────────────────┐
│ ✖ test1.js XX:XX - - 1 - - │
└────────────────────────────────────────────────────────────────────────────────────────────────┘
✖ 1 of 1 failed (100%) XX:XX - - 1 - -
✖ 1 of 1 failed (100%) XX:XX - - 1 - -

----------------------------------------------------------------------------------------------------

Expand Down
22 changes: 11 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,15 +418,15 @@ 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
]),
}
Expand Down Expand Up @@ -621,9 +621,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
30 changes: 15 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,34 @@ 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',

// 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',
})

return expectsCommitParams({
Expand Down
Loading