Skip to content

Commit

Permalink
revert: restore deploy preview behavior (#5536)
Browse files Browse the repository at this point in the history
* Revert "Fix Prod Storybook deployment (#5535)"

This reverts commit 8b96591.

* Revert "fix: deploy_preview workflow (#5529)"

This reverts commit be42cc6.

* Revert "Fixing deploy_preview workflow (#5526)"

This reverts commit 62353f2.

* Revert "Remove branch from preview_deploy.yml (#5523)"

This reverts commit e2075bd.

* Revert "Add landing page and upload vrt/aat reports to GitHub Pages (#5499)"

This reverts commit 5a6d7bb.
  • Loading branch information
joshblack authored Jan 13, 2025
1 parent 8b96591 commit 15270ac
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 311 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ jobs:
path: playwright-report
- name: check vrt-runner job status
if: ${{ needs.vrt-runner.result == 'failure' }}
continue-on-error: true
run: exit 1

vrt-runner-all-flags:
Expand Down Expand Up @@ -247,7 +246,6 @@ jobs:
path: playwright-report
- name: check vrt-runner-all-flags job status
if: ${{ needs.vrt-runner-all-flags.result == 'failure' }}
continue-on-error: true
run: exit 1

aat-runner:
Expand Down Expand Up @@ -320,7 +318,6 @@ jobs:
path: playwright-report
- name: Check aat-runner job status
if: ${{ needs.aat-runner.result == 'failure' }}
continue-on-error: true
run: exit 1

aat-runner-all-flags:
Expand Down Expand Up @@ -397,7 +394,6 @@ jobs:
path: playwright-report
- name: Check aat-runner-all-flags job status
if: ${{ needs.aat-runner-all-flags.result == 'failure' }}
continue-on-error: true
run: exit 1

build-components-json:
Expand Down
32 changes: 31 additions & 1 deletion .github/workflows/deploy_preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
build:
if: ${{ github.event.pull_request.head.repo.full_name == 'primer/react' }}
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down Expand Up @@ -46,3 +45,34 @@ jobs:
uses: actions/deploy-pages@v4
with:
preview: true

deploy-storybook:
name: Preview Storybook
if: ${{ github.event.pull_request.head.repo.full_name == 'primer/react' }}
needs: deploy-preview
permissions:
deployments: write
runs-on: ubuntu-latest
steps:
- uses: chrnorm/[email protected]
name: Create GitHub deployment for storybook
id: storybook
with:
token: ${{ secrets.GITHUB_TOKEN }}
environment: storybook-preview-${{ github.event.number }}
environment_url: '${{ needs.deploy-preview.outputs.deployment_url }}/storybook'
- name: Update storybook deployment status (success)
if: success()
uses: chrnorm/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
environment-url: '${{ needs.deploy-preview.outputs.deployment_url }}/storybook'
state: 'success'
deployment-id: ${{ steps.storybook.outputs.deployment_id }}
- name: Update storybook deployment status (failure)
if: failure()
uses: chrnorm/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
state: 'failure'
deployment-id: ${{ steps.storybook.outputs.deployment_id }}
238 changes: 0 additions & 238 deletions .github/workflows/deploy_preview_with_reports.yml

This file was deleted.

3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@
"start": "concurrently npm:start:*",
"start:storybook": "npm run start:storybook -w @primer/react",
"build:storybook": "script/build-storybook",
"build:storybook:preview": "script/build-storybook preview",
"build:storybook:preview_with_reports": "script/build-storybook preview_with_reports",
"build:docs": "NODE_OPTIONS=--openssl-legacy-provider script/build-docs",
"build:docs:preview": "NODE_OPTIONS=--openssl-legacy-provider script/build-docs preview",
"build:docs:preview_with_reports": "NODE_OPTIONS=--openssl-legacy-provider script/build-docs preview_with_reports",
"build:components.json": "npm run build:components.json -w @primer/react",
"lint": "eslint '**/*.{js,ts,tsx,md,mdx}' --max-warnings=0",
"lint:css": "stylelint --rd -q '**/*.css'",
Expand Down
22 changes: 0 additions & 22 deletions packages/react/.storybook/index.html

This file was deleted.

28 changes: 0 additions & 28 deletions packages/react/.storybook/index_with_reports.html

This file was deleted.

7 changes: 2 additions & 5 deletions script/build-docs
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#!/bin/bash
set -e

if [ "$1" == "preview" ]; then
if [ -n "$1" ]; then
export DEPLOY_ENV="preview"
npm run build:storybook:preview
elif [ "$1" == "preview_with_reports" ]; then
export DEPLOY_ENV="preview"
npm run build:storybook:preview_with_reports
npm run build:storybook preview
else
export DEPLOY_ENV="production"
npm run build:storybook
Expand Down
Loading

0 comments on commit 15270ac

Please sign in to comment.