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

feat: setup OS proxy #207

Merged
merged 19 commits into from
Oct 23, 2023
Merged

feat: setup OS proxy #207

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e5cb586
feat: setup OS proxy
tianfeng92 Oct 19, 2023
189b486
Update src/network-proxy.ts
tianfeng92 Oct 23, 2023
aba032f
Update src/testcafe-runner.ts
tianfeng92 Oct 23, 2023
a841de8
Update src/testcafe-runner.ts
tianfeng92 Oct 23, 2023
08c17d8
Update src/network-proxy.ts
tianfeng92 Oct 23, 2023
80c63e2
add comments to explain why we need the os proxy
tianfeng92 Oct 23, 2023
e1ff412
add type for proxy
tianfeng92 Oct 23, 2023
50fe548
add e2e test for proxy
tianfeng92 Oct 23, 2023
4f282f8
add comments for isCDPDisabled
tianfeng92 Oct 23, 2023
b7ffd4a
update e2e tests for sauce-connect and proxy
tianfeng92 Oct 23, 2023
5ed5b63
revert npm ci changes
tianfeng92 Oct 23, 2023
fd30ead
add comment and do checks more precisely
tianfeng92 Oct 23, 2023
badc53e
revert settings
tianfeng92 Oct 23, 2023
f48852f
cleanup pipeline
tianfeng92 Oct 23, 2023
37ade89
save pipeline
tianfeng92 Oct 23, 2023
81c8b61
update comments and revert sc tests
tianfeng92 Oct 23, 2023
9006f7e
only run sc for proxy check
tianfeng92 Oct 23, 2023
bfeef03
Update src/testcafe-runner.ts
tianfeng92 Oct 23, 2023
49d2230
revised
tianfeng92 Oct 23, 2023
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
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
echo "tag_name=${TAG_NAME}" >> $GITHUB_OUTPUT

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
if: ${{ steps.prep.outputs.tag_name == '' }}
with:
ref: ${{ github.ref }}
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
- run: Write-Output "${{ steps.prep.outputs.release_id }} - ${{ steps.prep.outputs.version }} - ${{ steps.prep.outputs.asset_id }}"

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
if: ${{ steps.prep.outputs.asset_id == '' }}
with:
ref: ${{ steps.prep.outputs.version }}
Expand Down Expand Up @@ -195,7 +195,7 @@ jobs:
- run: echo "${{ steps.prep.outputs.release_id }} - ${{ steps.prep.outputs.version }} - ${{ steps.prep.outputs.asset_id }}"

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
if: ${{ steps.prep.outputs.asset_id == '' }}
with:
ref: ${{ steps.prep.outputs.version }}
Expand Down Expand Up @@ -275,10 +275,10 @@ jobs:
SAUCE_USERNAME: ${{secrets.SAUCE_USERNAME}}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup saucectl
uses: saucelabs/saucectl-run-action@v3
uses: saucelabs/saucectl-run-action@v4
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand Down Expand Up @@ -308,10 +308,10 @@ jobs:
SAUCE_USERNAME: ${{secrets.SAUCE_USERNAME}}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup saucectl
uses: saucelabs/saucectl-run-action@v3
uses: saucelabs/saucectl-run-action@v4
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand Down
67 changes: 59 additions & 8 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
needs: [test]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
needs: [test]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
Expand Down Expand Up @@ -179,10 +179,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup saucectl
uses: saucelabs/saucectl-run-action@v3
uses: saucelabs/saucectl-run-action@v4
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand Down Expand Up @@ -223,15 +223,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Setup saucectl
uses: saucelabs/saucectl-run-action@v3
uses: saucelabs/saucectl-run-action@v4
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand All @@ -248,7 +248,7 @@ jobs:
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
tunnelName: github-testcafe-sc-check-tunnel-${{ matrix.os }}-${{ matrix.browser }}
scVersion: 4.8.1
scVersion: 4.9.1

- name: Test on Sauce
working-directory: ./tests/cloud/
Expand All @@ -263,3 +263,54 @@ jobs:
--config ./.sauce/config-sc.yml \
--tunnel-name github-testcafe-sc-check-tunnel-${{ matrix.os }}-${{ matrix.browser }} \
--select-suite "${{ matrix.os }} - ${{ matrix.browser }}"

bundle-test-proxy:
needs: [build-windows-bundle, build-mac-bundle]
strategy:
max-parallel: 3
fail-fast: false
matrix:
os: [Win11, macOS13]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Setup saucectl
uses: saucelabs/saucectl-run-action@v4
env:
GITHUB_TOKEN: ${{ github.token }}
with:
skip-run: true

- name: Run web-page
run: |
python -m http.server 8000 &
working-directory: ./tests/cloud/www/

- name: Start sauce-connect
uses: saucelabs/sauce-connect-action@v2
with:
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
tunnelName: github-testcafe-sc-check-tunnel-${{ matrix.os }}-${{ matrix.browser }}
scVersion: 4.9.1

- name: Test on Sauce
working-directory: ./tests/cloud/
run: |
BUNDLE_URL=https://storage.googleapis.com/${{ secrets.GCS_RUNNER_BUCKET }}/testcafe-windows-amd64-${{ github.run_id }}.zip
if [[ ${{ matrix.os }} =~ ^mac ]];then
BUNDLE_URL=https://storage.googleapis.com/${{ secrets.GCS_RUNNER_BUCKET }}/testcafe-macos-amd64-${{ github.run_id }}.zip
fi

saucectl run \
--runner-version "url: ${BUNDLE_URL}" \
--config ./.sauce/config-proxy.yml \
--tunnel-name github-testcafe-sc-check-tunnel-${{ matrix.os }}-${{ matrix.browser }} \
tianfeng92 marked this conversation as resolved.
Show resolved Hide resolved
--select-suite "Proxy - ${{ matrix.os }}"
Loading
Loading