Skip to content

Commit 31b2316

Browse files
committed
Revert "Add landing page and upload vrt/aat reports to GitHub Pages (#5499)"
This reverts commit 5a6d7bb.
1 parent a89b3da commit 31b2316

File tree

4 files changed

+7
-190
lines changed

4 files changed

+7
-190
lines changed

.github/workflows/ci.yml

-4
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ jobs:
170170
path: playwright-report
171171
- name: check vrt-runner job status
172172
if: ${{ needs.vrt-runner.result == 'failure' }}
173-
continue-on-error: true
174173
run: exit 1
175174

176175
vrt-runner-all-flags:
@@ -247,7 +246,6 @@ jobs:
247246
path: playwright-report
248247
- name: check vrt-runner-all-flags job status
249248
if: ${{ needs.vrt-runner-all-flags.result == 'failure' }}
250-
continue-on-error: true
251249
run: exit 1
252250

253251
aat-runner:
@@ -320,7 +318,6 @@ jobs:
320318
path: playwright-report
321319
- name: Check aat-runner job status
322320
if: ${{ needs.aat-runner.result == 'failure' }}
323-
continue-on-error: true
324321
run: exit 1
325322

326323
aat-runner-all-flags:
@@ -397,7 +394,6 @@ jobs:
397394
path: playwright-report
398395
- name: Check aat-runner-all-flags job status
399396
if: ${{ needs.aat-runner-all-flags.result == 'failure' }}
400-
continue-on-error: true
401397
run: exit 1
402398

403399
build-components-json:

.github/workflows/deploy_preview.yml

+7-157
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
name: Deploy Preview
22
on:
3-
workflow_run:
4-
branches:
5-
- main
6-
workflows: [CI]
7-
types:
8-
- completed
3+
pull_request:
94

105
concurrency:
116
group: ${{ github.workflow }}-${{ github.ref }}
127
cancel-in-progress: true
138

149
jobs:
1510
build:
16-
if: ${{ always() && github.event.workflow_run.event.pull_request.head.repo.full_name == 'primer/react' }}
11+
if: ${{ github.event.pull_request.head.repo.full_name == 'primer/react' }}
1712
runs-on: ubuntu-latest
18-
1913
steps:
2014
- name: Checkout repository
2115
uses: actions/checkout@v4
@@ -28,33 +22,13 @@ jobs:
2822
run: npm ci
2923
- name: Build docs preview
3024
run: npm run build:docs:preview
31-
- name: Download VRT reports (All flags enabled)
32-
uses: actions/download-artifact@v4
33-
with:
34-
name: vrt-all-flags
35-
path: docs/public/vrt-all-flags
36-
- name: Download VRT reports (No flags enabled)
37-
uses: actions/download-artifact@v4
38-
with:
39-
name: vrt-no-flag
40-
path: docs/public/vrt-no-flag
41-
- name: Download AAT reports (All flags enabled)
42-
uses: actions/download-artifact@v4
43-
with:
44-
name: axe-all-flags
45-
path: docs/public/aat-all-flags
46-
- name: Download AAT reports (No flags enabled)
47-
uses: actions/download-artifact@v4
48-
with:
49-
name: axe
50-
path: docs/public/aat-no-flag
5125
- uses: actions/upload-pages-artifact@v3
5226
with:
5327
name: github-pages
5428
path: docs/public
5529

5630
deploy-preview:
57-
if: ${{ always() && github.event.workflow_run.event.pull_request.head.repo.full_name == 'primer/react' }}
31+
if: ${{ github.event.pull_request.head.repo.full_name == 'primer/react' }}
5832
needs: build
5933
permissions:
6034
pages: write
@@ -74,7 +48,7 @@ jobs:
7448

7549
deploy-storybook:
7650
name: Preview Storybook
77-
if: ${{ always() && github.event.workflow_run.event.pull_request.head.repo.full_name == 'primer/react' }}
51+
if: ${{ github.event.pull_request.head.repo.full_name == 'primer/react' }}
7852
needs: deploy-preview
7953
permissions:
8054
deployments: write
@@ -85,14 +59,14 @@ jobs:
8559
id: storybook
8660
with:
8761
token: ${{ secrets.GITHUB_TOKEN }}
88-
environment: storybook-preview-${{ github.event.workflow_run.event.number }}
89-
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}storybook'
62+
environment: storybook-preview-${{ github.event.number }}
63+
environment_url: '${{ needs.deploy-preview.outputs.deployment_url }}/storybook'
9064
- name: Update storybook deployment status (success)
9165
if: success()
9266
uses: chrnorm/[email protected]
9367
with:
9468
token: ${{ secrets.GITHUB_TOKEN }}
95-
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}storybook'
69+
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}/storybook'
9670
state: 'success'
9771
deployment-id: ${{ steps.storybook.outputs.deployment_id }}
9872
- name: Update storybook deployment status (failure)
@@ -102,127 +76,3 @@ jobs:
10276
token: ${{ secrets.GITHUB_TOKEN }}
10377
state: 'failure'
10478
deployment-id: ${{ steps.storybook.outputs.deployment_id }}
105-
106-
deploy-vrt-no-flag:
107-
name: VRT (No flags enabled)
108-
if: ${{ always() && github.event.workflow_run.event.pull_request.head.repo.full_name == 'primer/react' }}
109-
needs: [deploy-preview]
110-
permissions:
111-
deployments: write
112-
runs-on: ubuntu-latest
113-
steps:
114-
- uses: chrnorm/[email protected]
115-
name: Create GitHub deployment for vrt-no-flag
116-
id: vrt-no-flag
117-
with:
118-
token: ${{ secrets.GITHUB_TOKEN }}
119-
environment: vrt-no-flag-${{ github.event.workflow_run.event.number }}
120-
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}vrt-no-flag'
121-
- name: Update vrt-no-flag deployment status (success)
122-
if: success()
123-
uses: chrnorm/[email protected]
124-
with:
125-
token: ${{ secrets.GITHUB_TOKEN }}
126-
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}vrt-no-flag'
127-
state: 'success'
128-
deployment-id: ${{ steps.vrt-no-flag.outputs.deployment_id }}
129-
- name: Update vrt-no-flag deployment status (failure)
130-
if: failure()
131-
uses: chrnorm/[email protected]
132-
with:
133-
token: ${{ secrets.GITHUB_TOKEN }}
134-
state: 'failure'
135-
deployment-id: ${{ steps.vrt-no-flag.outputs.deployment_id }}
136-
137-
deploy-vrt-all-flags:
138-
name: VRT (All flags enabled)
139-
if: ${{ always() && github.event.workflow_run.event.pull_request.head.repo.full_name == 'primer/react' }}
140-
needs: deploy-preview
141-
permissions:
142-
deployments: write
143-
runs-on: ubuntu-latest
144-
steps:
145-
- uses: chrnorm/[email protected]
146-
name: Create GitHub deployment for vrt-all-flags
147-
id: vrt-all-flags
148-
with:
149-
token: ${{ secrets.GITHUB_TOKEN }}
150-
environment: vrt-all-flags-${{ github.event.workflow_run.event.number }}
151-
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}vrt-all-flags'
152-
- name: Update vrt-all-flags deployment status (success)
153-
if: success()
154-
uses: chrnorm/[email protected]
155-
with:
156-
token: ${{ secrets.GITHUB_TOKEN }}
157-
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}vrt-all-flags'
158-
state: 'success'
159-
deployment-id: ${{ steps.vrt-all-flags.outputs.deployment_id }}
160-
- name: Update vrt-all-flags deployment status (failure)
161-
if: failure()
162-
uses: chrnorm/[email protected]
163-
with:
164-
token: ${{ secrets.GITHUB_TOKEN }}
165-
state: 'failure'
166-
deployment-id: ${{ steps.vrt-all-flags.outputs.deployment_id }}
167-
168-
deploy-aat-no-flag:
169-
name: AAT (No flags enabled)
170-
if: ${{ always() && github.event.workflow_run.event.pull_request.head.repo.full_name == 'primer/react' }}
171-
needs: deploy-preview
172-
permissions:
173-
deployments: write
174-
runs-on: ubuntu-latest
175-
steps:
176-
- uses: chrnorm/[email protected]
177-
name: Create GitHub deployment for aat-no-flag
178-
id: aat-no-flag
179-
with:
180-
token: ${{ secrets.GITHUB_TOKEN }}
181-
environment: aat-no-flag-${{ github.event.workflow_run.event.number }}
182-
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}aat-no-flag'
183-
- name: Update aat-no-flag deployment status (success)
184-
if: success()
185-
uses: chrnorm/[email protected]
186-
with:
187-
token: ${{ secrets.GITHUB_TOKEN }}
188-
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}aat-no-flag'
189-
state: 'success'
190-
deployment-id: ${{ steps.aat-no-flag.outputs.deployment_id }}
191-
- name: Update aat-no-flag deployment status (failure)
192-
if: failure()
193-
uses: chrnorm/[email protected]
194-
with:
195-
token: ${{ secrets.GITHUB_TOKEN }}
196-
state: 'failure'
197-
deployment-id: ${{ steps.aat-no-flag.outputs.deployment_id }}
198-
199-
deploy-aat-all-flags:
200-
name: AAT (All flags enabled)
201-
if: ${{ always() && github.event.workflow_run.event.pull_request.head.repo.full_name == 'primer/react' }}
202-
needs: deploy-preview
203-
permissions:
204-
deployments: write
205-
runs-on: ubuntu-latest
206-
steps:
207-
- uses: chrnorm/[email protected]
208-
name: Create GitHub deployment for aat-all-flags
209-
id: aat-all-flags
210-
with:
211-
token: ${{ secrets.GITHUB_TOKEN }}
212-
environment: aat-all-flags-${{ github.event.workflow_run.event.number }}
213-
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}aat-all-flags'
214-
- name: Update aat-all-flags deployment status (success)
215-
if: success()
216-
uses: chrnorm/[email protected]
217-
with:
218-
token: ${{ secrets.GITHUB_TOKEN }}
219-
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}aat-all-flags'
220-
state: 'success'
221-
deployment-id: ${{ steps.aat-all-flags.outputs.deployment_id }}
222-
- name: Update aat-all-flags deployment status (failure)
223-
if: failure()
224-
uses: chrnorm/[email protected]
225-
with:
226-
token: ${{ secrets.GITHUB_TOKEN }}
227-
state: 'failure'
228-
deployment-id: ${{ steps.aat-all-flags.outputs.deployment_id }}

packages/react/.storybook/index.html

-25
This file was deleted.

script/build-storybook

-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,5 @@ fi
1313
# Build storybook inside docs
1414
npx storybook build -o ../../docs/public/storybook
1515

16-
# Move index page to the right location
17-
cp .storybook/index.html ../../docs/public/index.html
18-
1916
# Remove manager-head after build to not interfere with dev builds
2017
rm .storybook/manager-head.html
21-
rm .storybook/index.html

0 commit comments

Comments
 (0)