Skip to content

Commit 38d9a99

Browse files
authored
Merge branch 'main' into collected-updates
2 parents 7d80e13 + bf79e7f commit 38d9a99

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

docs/guides/continuous-integration/ci-provider-examples.mdx

-4
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,6 @@ and
226226
- [Basic .semaphore.yml](https://github.com/cypress-io/cypress-example-kitchensink/blob/master/basic/.semaphore.yml)
227227
- [Parallel .semaphore.yml](https://github.com/cypress-io/cypress-example-kitchensink/blob/master/.semaphore/semaphore.yml)
228228

229-
### Shippable
230-
231-
- [shippable.yml](https://github.com/cypress-io/cypress-example-kitchensink/blob/master/shippable.yml)
232-
233229
### AppVeyor
234230

235231
- [Basic Example (appveyor.yml)](https://github.com/cypress-io/cypress-example-kitchensink/blob/master/appveyor.yml)

docs/guides/continuous-integration/github-actions.mdx

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ actions used below.
4545

4646
The Cypress team maintains the official
4747
[Cypress GitHub Action](https://github.com/marketplace/actions/cypress-io) for
48-
running Cypress tests. This action provides npm installation, custom caching,
49-
additional configuration options and simplifies setup of advanced workflows with
50-
Cypress in the GitHub Actions platform.
48+
running Cypress tests. This action provides npm, pnpm or yarn installation,
49+
custom caching, additional configuration options and simplifies setup of
50+
advanced workflows with Cypress in the GitHub Actions platform.
5151

5252
### Explicit Version Number
5353

docs/guides/guides/parallelization.mdx

+1
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ build ID for a test run:
381381
| Azure Pipelines | `BUILD_BUILDNUMBER` |
382382
| Bamboo | `bamboo_buildNumber` |
383383
| Bitbucket | `BITBUCKET_BUILD_NUMBER` |
384+
| Buildkite | `BUILDKITE_BUILD_ID` |
384385
| Circle | `CIRCLE_WORKFLOW_ID`, `CIRCLE_BUILD_NUM` |
385386
| Codeship | `CI_BUILD_NUMBER` |
386387
| Codeship Basic | `CI_BUILD_NUMBER` |

0 commit comments

Comments
 (0)