Skip to content

Commit 251601f

Browse files
jonrohanfrancinelucca
jonrohan
and
francinelucca
committed
Remove the extra VRT runs with the CSS module flags enabled (#6016)
Co-authored-by: Marie Lucca <[email protected]>
1 parent 790fdd0 commit 251601f

File tree

5 files changed

+40
-340
lines changed

5 files changed

+40
-340
lines changed

‎.github/workflows/aat-reports.yml‎

Lines changed: 4 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ name: AAT Reports
22
on:
33
workflow_call:
44
outputs:
5-
aat-all-flags:
6-
value: ${{ jobs.aat-all-flags.result }}
7-
aat-no-flag:
5+
aat:
86
value: ${{ jobs.aat.result }}
97

108
concurrency:
@@ -50,7 +48,7 @@ jobs:
5048
if: ${{ always() }}
5149
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
5250
with:
53-
name: axe-no-flag-${{ matrix.shard }}
51+
name: aat-${{ matrix.shard }}
5452
path: blob-report
5553
retention-days: 1
5654

@@ -71,89 +69,15 @@ jobs:
7169
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
7270
with:
7371
path: all-blob-reports
74-
pattern: axe-no-flag-*
72+
pattern: aat-*
7573
merge-multiple: true
7674
- name: merge all reports
7775
run: npx playwright merge-reports --reporter html ./all-blob-reports
7876
- name: Upload report
7977
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
8078
with:
81-
name: axe
79+
name: aat
8280
path: playwright-report
8381
- name: Check aat-runner job status
8482
if: ${{ needs.aat-runner.result == 'failure' }}
8583
run: exit 1
86-
87-
aat-runner-all-flags:
88-
runs-on: ubuntu-latest-16-cores
89-
strategy:
90-
fail-fast: false
91-
matrix:
92-
shard: [1, 2, 3, 4]
93-
env:
94-
VITE_PRIMER_REACT_CSS_MODULES_GA: 1
95-
steps:
96-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
97-
- name: Use Node.js 20.x
98-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
99-
with:
100-
node-version: 22
101-
cache: 'npm'
102-
- name: Install dependencies
103-
run: npm ci
104-
- name: Build storybook
105-
run: npx storybook build
106-
working-directory: packages/react
107-
- name: Run storybook
108-
id: storybook
109-
working-directory: packages/react
110-
run: |
111-
npx serve -l 6006 storybook-static &
112-
pid=$!
113-
echo "pid=$pid" >> $GITHUB_OUTPUT
114-
sleep 5
115-
- name: Run AAT
116-
uses: docker://mcr.microsoft.com/playwright:v1.52.0-jammy
117-
env:
118-
STORYBOOK_URL: 'http://172.17.0.1:6006'
119-
with:
120-
args: npx playwright test --grep @aat --shard="${{ matrix.shard }}/${{ strategy.job-total }}"
121-
- name: Stop storybook
122-
run: kill ${{ steps.storybook.outputs.pid }}
123-
- name: Upload report
124-
if: ${{ always() }}
125-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
126-
with:
127-
name: axe-all-flags-${{ matrix.shard }}
128-
path: blob-report
129-
retention-days: 1
130-
131-
aat-all-flags:
132-
if: ${{ always() }}
133-
runs-on: ubuntu-latest
134-
needs: aat-runner-all-flags
135-
steps:
136-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
137-
- name: Use Node.js 20.x
138-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
139-
with:
140-
node-version: 22
141-
cache: 'npm'
142-
- name: install dependencies
143-
run: npm ci
144-
- name: download all reports
145-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
146-
with:
147-
path: all-blob-reports
148-
pattern: axe-all-flags-*
149-
merge-multiple: true
150-
- name: merge all reports
151-
run: npx playwright merge-reports --reporter html ./all-blob-reports
152-
- name: Upload report
153-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
154-
with:
155-
name: axe-all-flags
156-
path: playwright-report
157-
- name: Check aat-runner-all-flags job status
158-
if: ${{ needs.aat-runner-all-flags.result == 'failure' }}
159-
run: exit 1

‎.github/workflows/deploy_preview.yml‎

Lines changed: 6 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,16 @@ jobs:
3232
run: npm ci
3333
- name: Build docs preview
3434
run: npm run build:docs:preview
35-
- name: Download VRT reports (All flags enabled)
35+
- name: Download VRT reports
3636
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
3737
with:
38-
name: vrt-all-flags
39-
path: docs/public/vrt-all-flags
40-
- name: Download VRT reports (No flags enabled)
38+
name: vrt
39+
path: docs/public/vrt
40+
- name: Download AAT reports
4141
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
4242
with:
43-
name: vrt-no-flag
44-
path: docs/public/vrt-no-flag
45-
- name: Download AAT reports (All flags enabled)
46-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
47-
with:
48-
name: axe-all-flags
49-
path: docs/public/aat-all-flags
50-
- name: Download AAT reports (No flags enabled)
51-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
52-
with:
53-
name: axe
54-
path: docs/public/aat-no-flag
43+
name: aat
44+
path: docs/public/aat
5545
- uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa
5646
with:
5747
name: github-pages
@@ -106,127 +96,3 @@ jobs:
10696
token: ${{ secrets.GITHUB_TOKEN }}
10797
state: 'failure'
10898
deployment-id: ${{ steps.storybook.outputs.deployment_id }}
109-
110-
# deploy-vrt-no-flag:
111-
# name: VRT (No flags enabled)
112-
# if: ${{ always() && github.event.pull_request.head.repo.full_name == 'primer/react' }}
113-
# needs: [deploy-preview]
114-
# permissions:
115-
# deployments: write
116-
# runs-on: ubuntu-latest
117-
# steps:
118-
# - uses: chrnorm/deployment-action@55729fcebec3d284f60f5bcabbd8376437d696b1
119-
# name: Create GitHub deployment for vrt-no-flag
120-
# id: vrt-no-flag
121-
# with:
122-
# token: ${{ secrets.GITHUB_TOKEN }}
123-
# environment: vrt-no-flag-${{ github.event.number }}
124-
# environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}vrt-no-flag'
125-
# - name: Update vrt-no-flag deployment status (success)
126-
# if: success()
127-
# uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806
128-
# with:
129-
# token: ${{ secrets.GITHUB_TOKEN }}
130-
# environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}vrt-no-flag'
131-
# state: 'success'
132-
# deployment-id: ${{ steps.vrt-no-flag.outputs.deployment_id }}
133-
# - name: Update vrt-no-flag deployment status (failure)
134-
# if: failure()
135-
# uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806
136-
# with:
137-
# token: ${{ secrets.GITHUB_TOKEN }}
138-
# state: 'failure'
139-
# deployment-id: ${{ steps.vrt-no-flag.outputs.deployment_id }}
140-
141-
# deploy-vrt-all-flags:
142-
# name: VRT (All flags enabled)
143-
# if: ${{ always() && github.event.pull_request.head.repo.full_name == 'primer/react' }}
144-
# needs: deploy-preview
145-
# permissions:
146-
# deployments: write
147-
# runs-on: ubuntu-latest
148-
# steps:
149-
# - uses: chrnorm/deployment-action@55729fcebec3d284f60f5bcabbd8376437d696b1
150-
# name: Create GitHub deployment for vrt-all-flags
151-
# id: vrt-all-flags
152-
# with:
153-
# token: ${{ secrets.GITHUB_TOKEN }}
154-
# environment: vrt-all-flags-${{ github.event.number }}
155-
# environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}vrt-all-flags'
156-
# - name: Update vrt-all-flags deployment status (success)
157-
# if: success()
158-
# uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806
159-
# with:
160-
# token: ${{ secrets.GITHUB_TOKEN }}
161-
# environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}vrt-all-flags'
162-
# state: 'success'
163-
# deployment-id: ${{ steps.vrt-all-flags.outputs.deployment_id }}
164-
# - name: Update vrt-all-flags deployment status (failure)
165-
# if: failure()
166-
# uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806
167-
# with:
168-
# token: ${{ secrets.GITHUB_TOKEN }}
169-
# state: 'failure'
170-
# deployment-id: ${{ steps.vrt-all-flags.outputs.deployment_id }}
171-
172-
# deploy-aat-no-flag:
173-
# name: AAT (No flags enabled)
174-
# if: ${{ always() && github.event.pull_request.head.repo.full_name == 'primer/react' }}
175-
# needs: deploy-preview
176-
# permissions:
177-
# deployments: write
178-
# runs-on: ubuntu-latest
179-
# steps:
180-
# - uses: chrnorm/deployment-action@55729fcebec3d284f60f5bcabbd8376437d696b1
181-
# name: Create GitHub deployment for aat-no-flag
182-
# id: aat-no-flag
183-
# with:
184-
# token: ${{ secrets.GITHUB_TOKEN }}
185-
# environment: aat-no-flag-${{ github.event.number }}
186-
# environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}aat-no-flag'
187-
# - name: Update aat-no-flag deployment status (success)
188-
# if: success()
189-
# uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806
190-
# with:
191-
# token: ${{ secrets.GITHUB_TOKEN }}
192-
# environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}aat-no-flag'
193-
# state: 'success'
194-
# deployment-id: ${{ steps.aat-no-flag.outputs.deployment_id }}
195-
# - name: Update aat-no-flag deployment status (failure)
196-
# if: failure()
197-
# uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806
198-
# with:
199-
# token: ${{ secrets.GITHUB_TOKEN }}
200-
# state: 'failure'
201-
# deployment-id: ${{ steps.aat-no-flag.outputs.deployment_id }}
202-
203-
# deploy-aat-all-flags:
204-
# name: AAT (All flags enabled)
205-
# if: ${{ always() && github.event.pull_request.head.repo.full_name == 'primer/react' }}
206-
# needs: deploy-preview
207-
# permissions:
208-
# deployments: write
209-
# runs-on: ubuntu-latest
210-
# steps:
211-
# - uses: chrnorm/deployment-action@55729fcebec3d284f60f5bcabbd8376437d696b1
212-
# name: Create GitHub deployment for aat-all-flags
213-
# id: aat-all-flags
214-
# with:
215-
# token: ${{ secrets.GITHUB_TOKEN }}
216-
# environment: aat-all-flags-${{ github.event.number }}
217-
# environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}aat-all-flags'
218-
# - name: Update aat-all-flags deployment status (success)
219-
# if: success()
220-
# uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806
221-
# with:
222-
# token: ${{ secrets.GITHUB_TOKEN }}
223-
# environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}aat-all-flags'
224-
# state: 'success'
225-
# deployment-id: ${{ steps.aat-all-flags.outputs.deployment_id }}
226-
# - name: Update aat-all-flags deployment status (failure)
227-
# if: failure()
228-
# uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806
229-
# with:
230-
# token: ${{ secrets.GITHUB_TOKEN }}
231-
# state: 'failure'
232-
# deployment-id: ${{ steps.aat-all-flags.outputs.deployment_id }}

‎.github/workflows/deploy_preview_forks.yml‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,16 @@ jobs:
3232
run: npm ci
3333
- name: Build docs preview
3434
run: npm run build:docs:preview
35-
- name: Download VRT reports (All flags enabled)
35+
- name: Download VRT reports
3636
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
3737
with:
38-
name: vrt-all-flags
39-
path: docs/public/vrt-all-flags
40-
- name: Download VRT reports (No flags enabled)
38+
name: vrt
39+
path: docs/public/vrt
40+
- name: Download AAT reports
4141
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
4242
with:
43-
name: vrt-no-flag
44-
path: docs/public/vrt-no-flag
45-
- name: Download AAT reports (All flags enabled)
46-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
47-
with:
48-
name: axe-all-flags
49-
path: docs/public/aat-all-flags
50-
- name: Download AAT reports (No flags enabled)
51-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
52-
with:
53-
name: axe
54-
path: docs/public/aat-no-flag
43+
name: aat
44+
path: docs/public/aat
5545
- uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa
5646
with:
5747
name: github-pages

0 commit comments

Comments
 (0)