From 5b7cde7c1ae5b4db9d93703d211b9a72a1e41ab9 Mon Sep 17 00:00:00 2001 From: Robbie Coomber Date: Mon, 19 Aug 2024 17:42:28 +0100 Subject: [PATCH 1/5] Move chrome tests off of browserstack --- .github/workflows/testcafe-browserstack.yml | 51 +++++++++++++++++++++ .github/workflows/testcafe.yml | 10 ++-- 2 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/testcafe-browserstack.yml diff --git a/.github/workflows/testcafe-browserstack.yml b/.github/workflows/testcafe-browserstack.yml new file mode 100644 index 000000000..6e1c94426 --- /dev/null +++ b/.github/workflows/testcafe-browserstack.yml @@ -0,0 +1,51 @@ +name: TestCafe BrowserStack +on: [pull_request] +env: + BROWSERSTACK_ACCESS_KEY: "${{ secrets.BROWSERSTACK_ACCESS_KEY }}" + BROWSERSTACK_USERNAME: "${{ secrets.BROWSERSTACK_USERNAME }}" + POSTHOG_PROJECT_KEY: "${{ secrets.POSTHOG_PROJECT_KEY }}" + POSTHOG_API_KEY: "${{ secrets.POSTHOG_API_KEY }}" + BROWSERSTACK_DEBUG: 'true' + BROWSERSTACK_NETWORK_LOGS: 'true' + BROWSERSTACK_CONSOLE: 'info' + BROWSERSTACK_FORCE_PROXY: 'true' + BROWSERSTACK_USE_AUTOMATE: 'true' + BROWSERSTACK_PROJECT_NAME: 'PostHog JS SDK' + +jobs: + browsers: + name: Test on ${{ matrix.name }} + runs-on: ubuntu-latest + + strategy: + matrix: + browser: + - ie + - safari + include: + - browser: ie + name: IE11 + - browser: safari + name: Safari + + steps: + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v4 + with: + version: 8.x.x + - uses: actions/setup-node@v4 + with: + node-version: '18' + cache: 'pnpm' + + - name: Serve static files + run: python -m http.server 8080 & + + - name: Install node dependencies + run: pnpm install + + - name: Set up posthog-js + run: pnpm build-rollup + + - name: Run ${{ matrix.name }} test + run: node scripts/run-testcafe-with-retries.mjs --browser "browserstack:${{ matrix.browser }}" --attempts 3 diff --git a/.github/workflows/testcafe.yml b/.github/workflows/testcafe.yml index 253b7fbe9..773590b2d 100644 --- a/.github/workflows/testcafe.yml +++ b/.github/workflows/testcafe.yml @@ -19,17 +19,13 @@ jobs: strategy: matrix: - browserstack: + browser: - chrome - ie - safari include: - - browserstack: chrome + - browser: chrome name: Chrome - - browserstack: ie - name: IE11 - - browserstack: safari - name: Safari steps: - uses: actions/checkout@v4 @@ -51,4 +47,4 @@ jobs: run: pnpm build-rollup - name: Run ${{ matrix.name }} test - run: node scripts/run-testcafe-with-retries.mjs --browser "browserstack:${{ matrix.browserstack }}" --attempts 3 + run: node scripts/run-testcafe-with-retries.mjs --browser "${{ matrix.browser }}" --attempts 3 From 1af5636359805837221a4c681b5aa19aa82c0680 Mon Sep 17 00:00:00 2001 From: Robbie Coomber Date: Mon, 19 Aug 2024 17:52:54 +0100 Subject: [PATCH 2/5] Fix --- .github/workflows/testcafe-browserstack.yml | 10 +++++----- .github/workflows/testcafe.yml | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/testcafe-browserstack.yml b/.github/workflows/testcafe-browserstack.yml index 6e1c94426..cae89caa6 100644 --- a/.github/workflows/testcafe-browserstack.yml +++ b/.github/workflows/testcafe-browserstack.yml @@ -14,18 +14,18 @@ env: jobs: browsers: - name: Test on ${{ matrix.name }} + name: Test on ${{ matrix.name }} with browserstack runs-on: ubuntu-latest strategy: matrix: - browser: + browserstack: - ie - safari include: - - browser: ie + - browserstack: ie name: IE11 - - browser: safari + - browserstack: safari name: Safari steps: @@ -48,4 +48,4 @@ jobs: run: pnpm build-rollup - name: Run ${{ matrix.name }} test - run: node scripts/run-testcafe-with-retries.mjs --browser "browserstack:${{ matrix.browser }}" --attempts 3 + run: node scripts/run-testcafe-with-retries.mjs --browser "browserstack:${{ matrix.browserstack }}" --attempts 3 diff --git a/.github/workflows/testcafe.yml b/.github/workflows/testcafe.yml index 773590b2d..a73649038 100644 --- a/.github/workflows/testcafe.yml +++ b/.github/workflows/testcafe.yml @@ -21,8 +21,6 @@ jobs: matrix: browser: - chrome - - ie - - safari include: - browser: chrome name: Chrome From db31f43ef1fc8065a07ef6204d284f751c89d711 Mon Sep 17 00:00:00 2001 From: Robbie Coomber Date: Mon, 19 Aug 2024 17:58:06 +0100 Subject: [PATCH 3/5] Fix --- .github/workflows/testcafe-browserstack.yml | 51 --------------------- .github/workflows/testcafe.yml | 10 +++- 2 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 .github/workflows/testcafe-browserstack.yml diff --git a/.github/workflows/testcafe-browserstack.yml b/.github/workflows/testcafe-browserstack.yml deleted file mode 100644 index cae89caa6..000000000 --- a/.github/workflows/testcafe-browserstack.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: TestCafe BrowserStack -on: [pull_request] -env: - BROWSERSTACK_ACCESS_KEY: "${{ secrets.BROWSERSTACK_ACCESS_KEY }}" - BROWSERSTACK_USERNAME: "${{ secrets.BROWSERSTACK_USERNAME }}" - POSTHOG_PROJECT_KEY: "${{ secrets.POSTHOG_PROJECT_KEY }}" - POSTHOG_API_KEY: "${{ secrets.POSTHOG_API_KEY }}" - BROWSERSTACK_DEBUG: 'true' - BROWSERSTACK_NETWORK_LOGS: 'true' - BROWSERSTACK_CONSOLE: 'info' - BROWSERSTACK_FORCE_PROXY: 'true' - BROWSERSTACK_USE_AUTOMATE: 'true' - BROWSERSTACK_PROJECT_NAME: 'PostHog JS SDK' - -jobs: - browsers: - name: Test on ${{ matrix.name }} with browserstack - runs-on: ubuntu-latest - - strategy: - matrix: - browserstack: - - ie - - safari - include: - - browserstack: ie - name: IE11 - - browserstack: safari - name: Safari - - steps: - - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v4 - with: - version: 8.x.x - - uses: actions/setup-node@v4 - with: - node-version: '18' - cache: 'pnpm' - - - name: Serve static files - run: python -m http.server 8080 & - - - name: Install node dependencies - run: pnpm install - - - name: Set up posthog-js - run: pnpm build-rollup - - - name: Run ${{ matrix.name }} test - run: node scripts/run-testcafe-with-retries.mjs --browser "browserstack:${{ matrix.browserstack }}" --attempts 3 diff --git a/.github/workflows/testcafe.yml b/.github/workflows/testcafe.yml index a73649038..111087506 100644 --- a/.github/workflows/testcafe.yml +++ b/.github/workflows/testcafe.yml @@ -20,10 +20,16 @@ jobs: strategy: matrix: browser: - - chrome + - 'chrome:headless' + - 'browserstack:ie' + - 'browserstack:safari' include: - - browser: chrome + - browser: 'chrome:headless' name: Chrome + - browser: 'browserstack:ie' + name: IE11 + - browser: 'browserstack:safari' + name: Safari steps: - uses: actions/checkout@v4 From d19485063e3b6edd7c46f2449bcff56d2ebb9e1b Mon Sep 17 00:00:00 2001 From: Robbie Coomber Date: Mon, 19 Aug 2024 18:04:14 +0100 Subject: [PATCH 4/5] Add firefox --- .github/workflows/testcafe.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testcafe.yml b/.github/workflows/testcafe.yml index 111087506..4a5ab6fb4 100644 --- a/.github/workflows/testcafe.yml +++ b/.github/workflows/testcafe.yml @@ -21,6 +21,7 @@ jobs: matrix: browser: - 'chrome:headless' + - 'firefox:headless' - 'browserstack:ie' - 'browserstack:safari' include: From 9e3abfb4c740eeaab251730ddcde4c52ed5c21a2 Mon Sep 17 00:00:00 2001 From: Robbie Coomber Date: Mon, 19 Aug 2024 18:07:48 +0100 Subject: [PATCH 5/5] Fix --- .github/workflows/testcafe.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/testcafe.yml b/.github/workflows/testcafe.yml index 4a5ab6fb4..e0bac07c6 100644 --- a/.github/workflows/testcafe.yml +++ b/.github/workflows/testcafe.yml @@ -27,6 +27,8 @@ jobs: include: - browser: 'chrome:headless' name: Chrome + - browser: 'firefox:headless' + name: Firefox - browser: 'browserstack:ie' name: IE11 - browser: 'browserstack:safari'