From 2dbdd90b0e23a859ab704322e46bcd88c11eb432 Mon Sep 17 00:00:00 2001 From: Shawn Harris Date: Wed, 12 Apr 2023 16:11:55 -0700 Subject: [PATCH 01/12] rebase --- .../continuous-integration/github-actions.mdx | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/docs/guides/continuous-integration/github-actions.mdx b/docs/guides/continuous-integration/github-actions.mdx index 52e21e53cc..a0d85ac7a1 100644 --- a/docs/guides/continuous-integration/github-actions.mdx +++ b/docs/guides/continuous-integration/github-actions.mdx @@ -110,9 +110,9 @@ jobs: Try it out To try out the example above yourself, fork the -[Cypress Kitchen Sink](https://github.com/cypress-io/cypress-example-kitchensink) -example project and place the above GitHub Action configuration in -`.github/workflows/main.yml`. +[Cypress Kitchen Sink](https://github.com/cypress-io/cypress-realworld-app) +example project and place the above GitHub Action configuration in a newly +created `main.yml` file within `.github/workflows/`. ::: @@ -150,7 +150,7 @@ on: push jobs: cypress-run: runs-on: ubuntu-22.04 - container: cypress/browsers:node12.18.3-chrome87-ff82 + container: cypress/browsers:node18.12.0-chrome106-ff106 steps: - name: Checkout uses: actions/checkout@v3 @@ -192,7 +192,7 @@ on: push jobs: install: runs-on: ubuntu-22.04 - container: cypress/browsers:node12.18.3-chrome87-ff82 + container: cypress/browsers:node18.12.0-chrome106-ff106 steps: - name: Checkout uses: actions/checkout@v3 @@ -227,7 +227,7 @@ jobs: # .... cypress-run: runs-on: ubuntu-22.04 - container: cypress/browsers:node12.18.3-chrome87-ff82 + container: cypress/browsers:node18.12.0-chrome106-ff106 steps: - name: Checkout uses: actions/checkout@v3 @@ -295,7 +295,7 @@ on: push jobs: install: runs-on: ubuntu-22.04 - container: cypress/browsers:node12.18.3-chrome87-ff82 + container: cypress/browsers:node18.12.0-chrome106-ff106 steps: - name: Checkout uses: actions/checkout@v3 @@ -346,7 +346,7 @@ jobs: ui-chrome-tests: runs-on: ubuntu-22.04 - container: cypress/browsers:node12.18.3-chrome87-ff82 + container: cypress/browsers:node18.12.0-chrome106-ff106 needs: install strategy: fail-fast: false @@ -420,7 +420,7 @@ the configuration that was used in the install job. #... ui-chrome-tests: runs-on: ubuntu-22.04 - container: cypress/browsers:node12.18.3-chrome87-ff82 + container: cypress/browsers:node18.12.0-chrome106-ff106 needs: install strategy: fail-fast: false @@ -478,6 +478,13 @@ file. alt="Cypress Real World App GitHub Actions Matrix" /> +:::info + +To see additional how-to examples, you can also refer to our +[Cypress GitHub Action repo](https://github.com/cypress-io/github-action). + +::: + ## Common Problems and Solutions ### Re-run jobs passing with empty tests From 20c846a1621b47035915063d99ed4f7a33122eb1 Mon Sep 17 00:00:00 2001 From: Shawn Harris Date: Thu, 13 Apr 2023 17:22:44 -0700 Subject: [PATCH 02/12] add IP verbiage for on-prem GH/GL instances --- docs/faq/questions/cloud-faq.mdx | 6 +++++ docs/guides/cloud/github-integration.mdx | 32 ++++++++++++++++++++---- docs/guides/cloud/gitlab-integration.mdx | 9 ++++++- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/docs/faq/questions/cloud-faq.mdx b/docs/faq/questions/cloud-faq.mdx index 42f76d82da..c11dfd435d 100644 --- a/docs/faq/questions/cloud-faq.mdx +++ b/docs/faq/questions/cloud-faq.mdx @@ -233,3 +233,9 @@ Cloud. - `https://docs.cypress.io` - **Cypress documentation** - `https://download.cypress.io` - **CDN download of Cypress binary** - `https://on.cypress.io` - **URL shortener for link redirects** + + +**If you are using GitHub Enterprise or GitLab for Enterprise (Self-managed), you may also need to add the following:** + +- `3.211.102.119` - **Dedicated IP** +- `18.213.72.78` - **Dedicated IP** diff --git a/docs/guides/cloud/github-integration.mdx b/docs/guides/cloud/github-integration.mdx index 6c1b0668f0..6dced5e73e 100644 --- a/docs/guides/cloud/github-integration.mdx +++ b/docs/guides/cloud/github-integration.mdx @@ -137,11 +137,6 @@ to GitHub.com to complete the installation: 2. Choose which repositories to associate with the Cypress GitHub App. You can choose **All repositories** or **Only select repositories**. with your Cypress GitHub App installation. - :::info @@ -150,8 +145,21 @@ installation if you choose All repositories. ::: + + 3. Click the **Install** button to complete the installation. +:::warning + +If you are running the tests from within a restrictive VPN, see +[which subdomains to add to your allowlist for Cypress Cloud and your GitHub integration to work properly](../../faq/questions/cloud-faq#Im-working-at-a-restrictive-VPN-Which-subdomains-do-I-have-to-allow-on-my-VPN-for-Cypress-Cloud-to-work-properly) + +::: + ### Cypress GitHub Enterprise app installation process To integrate Cypress Cloud with GitHub Enterprise, you need to create a new @@ -268,6 +276,13 @@ them into Cypress Cloud, and complete the activation process. install the app against all repos or select specific ones, then click the **Install** button. +:::info + +All current and future repositories will be included with this +installation if you choose All repositories. + +::: + Date: Fri, 14 Apr 2023 09:40:51 -0700 Subject: [PATCH 03/12] run linter --- docs/faq/questions/cloud-faq.mdx | 4 ++-- docs/guides/cloud/github-integration.mdx | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/faq/questions/cloud-faq.mdx b/docs/faq/questions/cloud-faq.mdx index c11dfd435d..5ceac011e5 100644 --- a/docs/faq/questions/cloud-faq.mdx +++ b/docs/faq/questions/cloud-faq.mdx @@ -234,8 +234,8 @@ Cloud. - `https://download.cypress.io` - **CDN download of Cypress binary** - `https://on.cypress.io` - **URL shortener for link redirects** - -**If you are using GitHub Enterprise or GitLab for Enterprise (Self-managed), you may also need to add the following:** +**If you are using GitHub Enterprise or GitLab for Enterprise (Self-managed), +you may also need to add the following:** - `3.211.102.119` - **Dedicated IP** - `18.213.72.78` - **Dedicated IP** diff --git a/docs/guides/cloud/github-integration.mdx b/docs/guides/cloud/github-integration.mdx index 6dced5e73e..12cb11e008 100644 --- a/docs/guides/cloud/github-integration.mdx +++ b/docs/guides/cloud/github-integration.mdx @@ -145,11 +145,12 @@ installation if you choose All repositories. ::: - +{' '} + 3. Click the **Install** button to complete the installation. From 1d9bdd9dd2b2e839e06be50cbaaee44f426a7607 Mon Sep 17 00:00:00 2001 From: Shawn Harris Date: Fri, 14 Apr 2023 10:29:11 -0700 Subject: [PATCH 04/12] run linter --- docs/guides/cloud/github-integration.mdx | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/guides/cloud/github-integration.mdx b/docs/guides/cloud/github-integration.mdx index 12cb11e008..71b6cb02a7 100644 --- a/docs/guides/cloud/github-integration.mdx +++ b/docs/guides/cloud/github-integration.mdx @@ -146,6 +146,7 @@ installation if you choose All repositories. ::: {' '} + Date: Thu, 20 Apr 2023 14:58:51 -0700 Subject: [PATCH 05/12] relative paths --- docs/guides/cloud/github-integration.mdx | 2 +- docs/guides/cloud/gitlab-integration.mdx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/cloud/github-integration.mdx b/docs/guides/cloud/github-integration.mdx index 71b6cb02a7..c665b4d2dc 100644 --- a/docs/guides/cloud/github-integration.mdx +++ b/docs/guides/cloud/github-integration.mdx @@ -298,7 +298,7 @@ installation if you choose All repositories. :::warning If you are running the tests from within a restrictive VPN, see -[which subdomains to add to your allowlist for Cypress Cloud and your GitHub Enterprise integration to work properly](../../faq/questions/cloud-faq#Im-working-at-a-restrictive-VPN-Which-subdomains-do-I-have-to-allow-on-my-VPN-for-Cypress-Cloud-to-work-properly) +[which subdomains to add to your allowlist for Cypress Cloud and your GitHub Enterprise integration to work properly](/faq/questions/cloud-faq#Im-working-at-a-restrictive-VPN-Which-subdomains-do-I-have-to-allow-on-my-VPN-for-Cypress-Cloud-to-work-properly) ::: diff --git a/docs/guides/cloud/gitlab-integration.mdx b/docs/guides/cloud/gitlab-integration.mdx index 0ffc6d22c5..cd604802d9 100644 --- a/docs/guides/cloud/gitlab-integration.mdx +++ b/docs/guides/cloud/gitlab-integration.mdx @@ -91,7 +91,7 @@ with more limited access permissions. :::warning If you are running the tests from within a restrictive VPN, see -[which subdomains to add to your allowlist for Cypress Cloud and your GitLab integration to work properly](../../faq/questions/cloud-faq#Im-working-at-a-restrictive-VPN-Which-subdomains-do-I-have-to-allow-on-my-VPN-for-Cypress-Cloud-to-work-properly) +[which subdomains to add to your allowlist for Cypress Cloud and your GitLab integration to work properly](/faq/questions/cloud-faq#Im-working-at-a-restrictive-VPN-Which-subdomains-do-I-have-to-allow-on-my-VPN-for-Cypress-Cloud-to-work-properly) ::: From 5d7a90f719dc44333cbc6ad1c053658111eeec41 Mon Sep 17 00:00:00 2001 From: Shawn Harris Date: Thu, 20 Apr 2023 14:59:28 -0700 Subject: [PATCH 06/12] update md syntax --- docs/guides/cloud/github-integration.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/cloud/github-integration.mdx b/docs/guides/cloud/github-integration.mdx index c665b4d2dc..5581463970 100644 --- a/docs/guides/cloud/github-integration.mdx +++ b/docs/guides/cloud/github-integration.mdx @@ -140,8 +140,8 @@ to GitHub.com to complete the installation: :::info -All current and future repositories will be included with this -installation if you choose All repositories. +All current and _future_ repositories will be included with this +installation if you choose **All repositories**. ::: From 48d13bb6d31381d983f174273c5545a39a1ba9df Mon Sep 17 00:00:00 2001 From: Shawn Harris Date: Thu, 20 Apr 2023 15:16:25 -0700 Subject: [PATCH 07/12] resolve reviews --- docs/faq/questions/cloud-faq.mdx | 2 +- docs/guides/cloud/github-integration.mdx | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/faq/questions/cloud-faq.mdx b/docs/faq/questions/cloud-faq.mdx index 5ceac011e5..6b00de45ba 100644 --- a/docs/faq/questions/cloud-faq.mdx +++ b/docs/faq/questions/cloud-faq.mdx @@ -235,7 +235,7 @@ Cloud. - `https://on.cypress.io` - **URL shortener for link redirects** **If you are using GitHub Enterprise or GitLab for Enterprise (Self-managed), -you may also need to add the following:** +you may also need to add both the following:** - `3.211.102.119` - **Dedicated IP** - `18.213.72.78` - **Dedicated IP** diff --git a/docs/guides/cloud/github-integration.mdx b/docs/guides/cloud/github-integration.mdx index 5581463970..4d04e48ba3 100644 --- a/docs/guides/cloud/github-integration.mdx +++ b/docs/guides/cloud/github-integration.mdx @@ -140,13 +140,11 @@ to GitHub.com to complete the installation: :::info -All current and _future_ repositories will be included with this -installation if you choose **All repositories**. +All current and _future_ repositories will be included with this installation if +you choose **All repositories**. ::: -{' '} - Date: Thu, 20 Apr 2023 15:20:24 -0700 Subject: [PATCH 08/12] wrong PR --- .../continuous-integration/github-actions.mdx | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/docs/guides/continuous-integration/github-actions.mdx b/docs/guides/continuous-integration/github-actions.mdx index 0122fe67ec..2c1dc31186 100644 --- a/docs/guides/continuous-integration/github-actions.mdx +++ b/docs/guides/continuous-integration/github-actions.mdx @@ -110,9 +110,8 @@ jobs: Try it out To try out the example above yourself, fork the -[Cypress Kitchen Sink](https://github.com/cypress-io/cypress-realworld-app) -example project and place the above GitHub Action configuration in a newly -created `main.yml` file within `.github/workflows/`. +[Cypress Kitchen Sink](https://github.com/cypress-io/cypress-example-kitchensink) +example project and place the above GitHub Action configuration in `.github/workflows/main.yml`. ::: @@ -175,7 +174,7 @@ on: push jobs: cypress-run: runs-on: ubuntu-22.04 - container: cypress/browsers:node18.12.0-chrome106-ff106 + container: cypress/browsers:node12.18.3-chrome87-ff82 steps: - name: Checkout uses: actions/checkout@v3 @@ -217,7 +216,7 @@ on: push jobs: install: runs-on: ubuntu-22.04 - container: cypress/browsers:node18.12.0-chrome106-ff106 + container: cypress/browsers:node12.18.3-chrome87-ff82 steps: - name: Checkout uses: actions/checkout@v3 @@ -252,7 +251,7 @@ jobs: # .... cypress-run: runs-on: ubuntu-22.04 - container: cypress/browsers:node18.12.0-chrome106-ff106 + container: cypress/browsers:node12.18.3-chrome87-ff82 steps: - name: Checkout uses: actions/checkout@v3 @@ -320,7 +319,7 @@ on: push jobs: install: runs-on: ubuntu-22.04 - container: cypress/browsers:node18.12.0-chrome106-ff106 + container: cypress/browsers:node12.18.3-chrome87-ff82 steps: - name: Checkout uses: actions/checkout@v3 @@ -371,7 +370,7 @@ jobs: ui-chrome-tests: runs-on: ubuntu-22.04 - container: cypress/browsers:node18.12.0-chrome106-ff106 + container: cypress/browsers:node12.18.3-chrome87-ff82 needs: install strategy: fail-fast: false @@ -445,7 +444,7 @@ the configuration that was used in the install job. #... ui-chrome-tests: runs-on: ubuntu-22.04 - container: cypress/browsers:node18.12.0-chrome106-ff106 + container: cypress/browsers:node12.18.3-chrome87-ff82 needs: install strategy: fail-fast: false @@ -503,13 +502,6 @@ file. alt="Cypress Real World App GitHub Actions Matrix" /> -:::info - -To see additional how-to examples, you can also refer to our -[Cypress GitHub Action repo](https://github.com/cypress-io/github-action). - -::: - ## Common Problems and Solutions ### Re-run jobs passing with empty tests From 633f4a50ee08c183ac813252ddb36cbbfd30a7ef Mon Sep 17 00:00:00 2001 From: Shawn Harris Date: Thu, 20 Apr 2023 15:22:02 -0700 Subject: [PATCH 09/12] lint --- docs/guides/continuous-integration/github-actions.mdx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/guides/continuous-integration/github-actions.mdx b/docs/guides/continuous-integration/github-actions.mdx index 2c1dc31186..aa47991d4f 100644 --- a/docs/guides/continuous-integration/github-actions.mdx +++ b/docs/guides/continuous-integration/github-actions.mdx @@ -111,7 +111,8 @@ jobs: To try out the example above yourself, fork the [Cypress Kitchen Sink](https://github.com/cypress-io/cypress-example-kitchensink) -example project and place the above GitHub Action configuration in `.github/workflows/main.yml`. +example project and place the above GitHub Action configuration in +`.github/workflows/main.yml`. ::: From c7d9d38775f75a07ea5f81f6087b279c8d1601f7 Mon Sep 17 00:00:00 2001 From: Shawn Harris Date: Wed, 26 Apr 2023 14:18:51 -0700 Subject: [PATCH 10/12] update info to warning --- docs/guides/cloud/github-integration.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/cloud/github-integration.mdx b/docs/guides/cloud/github-integration.mdx index 4d04e48ba3..4b162970f6 100644 --- a/docs/guides/cloud/github-integration.mdx +++ b/docs/guides/cloud/github-integration.mdx @@ -293,7 +293,7 @@ installation if you choose All repositories. installed Cypress Cloud GitHub Enterprise integration! You are now ready to configure a GitHub Integration for a project. -:::warning +:::info If you are running the tests from within a restrictive VPN, see [which subdomains to add to your allowlist for Cypress Cloud and your GitHub Enterprise integration to work properly](/faq/questions/cloud-faq#Im-working-at-a-restrictive-VPN-Which-subdomains-do-I-have-to-allow-on-my-VPN-for-Cypress-Cloud-to-work-properly) From c8cba368fed5b9fd7762ae7cc321aa9092362439 Mon Sep 17 00:00:00 2001 From: Shawn Harris Date: Wed, 26 Apr 2023 14:28:42 -0700 Subject: [PATCH 11/12] provide more clarity --- docs/faq/questions/cloud-faq.mdx | 4 ++-- docs/guides/cloud/github-integration.mdx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/faq/questions/cloud-faq.mdx b/docs/faq/questions/cloud-faq.mdx index 6b00de45ba..e5219d92d8 100644 --- a/docs/faq/questions/cloud-faq.mdx +++ b/docs/faq/questions/cloud-faq.mdx @@ -217,7 +217,7 @@ by: 4. Review your organization's usage 5. Scroll down and select **Upgrade** under your plan of choice -## I'm working at a restrictive VPN. Which subdomains do I have to allow on my VPN for Cypress Cloud to work properly? +## I'm working with a restrictive VPN. Which subdomains do I have to allow on my VPN for Cypress Cloud to work properly? If you are running the tests from within a restrictive VPN you will need to allow some URLs so that Cypress can have effective communication with Cypress @@ -235,7 +235,7 @@ Cloud. - `https://on.cypress.io` - **URL shortener for link redirects** **If you are using GitHub Enterprise or GitLab for Enterprise (Self-managed), -you may also need to add both the following:** +you may also need to add both the following to the version control IP allow list:** - `3.211.102.119` - **Dedicated IP** - `18.213.72.78` - **Dedicated IP** diff --git a/docs/guides/cloud/github-integration.mdx b/docs/guides/cloud/github-integration.mdx index 4b162970f6..aa9c08d613 100644 --- a/docs/guides/cloud/github-integration.mdx +++ b/docs/guides/cloud/github-integration.mdx @@ -296,7 +296,7 @@ installation if you choose All repositories. :::info If you are running the tests from within a restrictive VPN, see -[which subdomains to add to your allowlist for Cypress Cloud and your GitHub Enterprise integration to work properly](/faq/questions/cloud-faq#Im-working-at-a-restrictive-VPN-Which-subdomains-do-I-have-to-allow-on-my-VPN-for-Cypress-Cloud-to-work-properly) +[which subdomains to add to your allowlist for Cypress Cloud and your GitHub Enterprise integration to work properly](/faq/questions/cloud-faq#Im-working-at-a-restrictive-VPN-Which-subdomains-do-I-have-to-allow-on-my-VPN-for-Cypress-Cloud-to-work-properly). ::: From 2e0912cecf3d85a831cdd0ab331abd398fa426f3 Mon Sep 17 00:00:00 2001 From: Shawn Harris Date: Wed, 26 Apr 2023 14:35:45 -0700 Subject: [PATCH 12/12] run lint --- docs/faq/questions/cloud-faq.mdx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/faq/questions/cloud-faq.mdx b/docs/faq/questions/cloud-faq.mdx index 088012a20f..462ec2776e 100644 --- a/docs/faq/questions/cloud-faq.mdx +++ b/docs/faq/questions/cloud-faq.mdx @@ -251,7 +251,8 @@ Cloud. - `https://on.cypress.io` - **URL shortener for link redirects** **If you are using GitHub Enterprise or GitLab for Enterprise (Self-managed), -you may also need to add both the following to the version control IP allow list:** +you may also need to add both the following to the version control IP allow +list:** - `3.211.102.119` - **Dedicated IP** - `18.213.72.78` - **Dedicated IP**