Skip to content

Commit

Permalink
Add windows and browser job to PR workflow (#5940)
Browse files Browse the repository at this point in the history
Addresses #5935 and #5955
This adds windows and web tests to the PR workflow.  They are by default turned off, but can be added with the `win` and `web` tags.  
    
### QA Notes
I tested with and without the win and web tags. It also works in conjunction with other tags.

@:win @:web
<!--
  Add additional information for QA on how to validate the change,
  paying special attention to the level of risk, adjacent areas that
  could be affected by the change, and any important contextual
  information not present in the linked issues.
-->
  • Loading branch information
jonvanausdeln authored Jan 13, 2025
1 parent 7f92f2a commit d786dc5
Show file tree
Hide file tree
Showing 7 changed files with 333 additions and 294 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/test-e2e-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ jobs:
with:
node-version-file: .nvmrc

- name: Transform to Playwright tags $PW_TAGS
run: bash scripts/pr-tags-transform.sh "e2e-windows" "${{ inputs.grep }}"
shell: bash

- name: Install System Level Python
uses: actions/setup-python@v5
with:
Expand Down Expand Up @@ -137,15 +141,12 @@ jobs:
role-to-assume: ${{ secrets.QA_AWS_RO_ROLE }}
aws-region: ${{ secrets.QA_AWS_REGION }}

- name: Transform to Playwright tags $PW_TAGS
run: bash scripts/pr-tags-transform.sh "e2e-windows" "${{ inputs.grep }}"
shell: bash

- name: Send Results to GH Summary
uses: ./.github/actions/gen-report-dir
if: ${{ !cancelled() }}

- name: Run Tests on Windows (Electron)
shell: bash
env:
POSITRON_PY_VER_SEL: 3.10.10
POSITRON_R_VER_SEL: 4.4.0
Expand Down
33 changes: 29 additions & 4 deletions .github/workflows/test-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
runs-on: ubuntu-latest
outputs:
tags: ${{ steps.pr-tags.outputs.tags }}
win_tag_found: ${{ steps.pr-tags.outputs.win_tag_found }}
web_tag_found: ${{ steps.pr-tags.outputs.web_tag_found }}

steps:
- uses: actions/checkout@v4

Expand All @@ -27,7 +30,7 @@ jobs:
GITHUB_REPOSITORY: ${{ github.repository }}
GITHUB_EVENT_PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}

e2e-electron:
e2e-linux-electron:
name: e2e
uses: ./.github/workflows/test-e2e-linux.yml
needs: pr-tags
Expand All @@ -38,6 +41,31 @@ jobs:
report_testrail: false
secrets: inherit

e2e-windows-electron:
needs: pr-tags
if: ${{ needs.pr-tags.outputs.win_tag_found == 'true' }}
name: e2e
uses: ./.github/workflows/test-e2e-windows.yml
with:
grep: ${{ needs.pr-tags.outputs.tags }}
display_name: "electron (windows)"
currents_tags: "pull-request,electron/windows,${{ needs.pr-tags.outputs.tags }}"
report_testrail: false
secrets: inherit

e2e-linux-browser:
needs: pr-tags
if: ${{ needs.pr-tags.outputs.web_tag_found == 'true' }}
name: e2e
uses: ./.github/workflows/test-e2e-linux.yml
with:
grep: ${{ needs.pr-tags.outputs.tags }}
display_name: "browser (linux)"
project: "e2e-browser"
currents_tags: "pull-request,browser/linux,${{ needs.pr-tags.outputs.tags }}"
report_testrail: false
secrets: inherit

unit-tests:
name: test
uses: ./.github/workflows/test-unit.yml
Expand All @@ -47,6 +75,3 @@ jobs:
name: test
uses: ./.github/workflows/test-integration.yml
secrets: inherit



Loading

0 comments on commit d786dc5

Please sign in to comment.