diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c95b517c..ba7cde51 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -88,6 +88,7 @@ jobs: build_storybook: name: Build Storybook + if: contains(github.event.pull_request.labels.*.name, 'storybook build') runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/.github/workflows/deploy-to-netlify.yaml b/.github/workflows/deploy-to-netlify.yaml index 08ae2e3f..c434e474 100644 --- a/.github/workflows/deploy-to-netlify.yaml +++ b/.github/workflows/deploy-to-netlify.yaml @@ -18,11 +18,6 @@ on: required: true type: string description: Which package to deploy - 'full', 'embedded', 'sdk', or 'storybook' - environment_name: - required: false - type: string - default: NetlifyDefault - description: The GitHub deployment environment label shown in the PR (e.g. 'Netlify', 'Storybook') artifact_run_id: required: false type: string @@ -48,7 +43,7 @@ jobs: with: step: start token: ${{ secrets.GITHUB_TOKEN }} - env: TestName + env: ${{ inputs.package}} ref: ${{ inputs.deployment_ref }} desc: | Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml index 17be74a4..28261b20 100644 --- a/.github/workflows/pr-deploy.yaml +++ b/.github/workflows/pr-deploy.yaml @@ -84,6 +84,24 @@ jobs: NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} + netlify-storybook: + needs: prdetails + if: ${{ needs.prdetails.outputs.pr_data_json && contains(fromJSON(needs.prdetails.outputs.pr_data_json).labels.*.name, 'storybook build') }} + permissions: + deployments: write + uses: ./.github/workflows/deploy-to-netlify.yaml + with: + artifact_run_id: ${{ github.event.workflow_run.id || github.run_id }} + pr_number: ${{ needs.prdetails.outputs.pr_number }} + pr_head_full_name: ${{ github.event.workflow_run.head_repository.full_name }} + pr_head_ref: ${{ needs.prdetails.outputs.pr_data_json && fromJSON(needs.prdetails.outputs.pr_data_json).head.ref }} + deployment_ref: ${{ needs.prdetails.outputs.pr_data_json && fromJSON(needs.prdetails.outputs.pr_data_json).head.sha || github.ref || github.head_ref }} + package: storybook + secrets: + ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} + NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} + docker: if: ${{ needs.prdetails.outputs.pr_data_json && contains(fromJSON(needs.prdetails.outputs.pr_data_json).labels.*.name, 'docker build') }} needs: prdetails diff --git a/backend/dev_nginx.conf b/backend/dev_nginx.conf index 834adaeb..6ec0d701 100644 --- a/backend/dev_nginx.conf +++ b/backend/dev_nginx.conf @@ -42,8 +42,6 @@ server { proxy_set_header Host $host; } - error_page 500 502 503 504 /50x.html; - } # Synapse reverse proxy including .well-known/matrix/client @@ -91,8 +89,6 @@ server { proxy_set_header Host $host; } - error_page 500 502 503 504 /50x.html; - } # MatrixRTC reverse proxy @@ -144,8 +140,6 @@ server { proxy_pass http://livekit-sfu:7880/; } - error_page 500 502 503 504 /50x.html; - } # MatrixRTC reverse proxy @@ -192,8 +186,6 @@ server { proxy_pass http://livekit-sfu-1:17880/; } - error_page 500 502 503 504 /50x.html; - } # Convenience reverse proxy for the call.m.localhost domain to element call @@ -243,7 +235,6 @@ server { proxy_pass http://host.docker.internal:8080; } - error_page 500 502 503 504 /50x.html; } @@ -276,8 +267,6 @@ server { } - error_page 500 502 503 504 /50x.html; - } # Convenience reverse proxy app.othersite.m.localhost for element web @@ -309,6 +298,4 @@ server { } - error_page 500 502 503 504 /50x.html; - } diff --git a/index.html b/index.html index f17c73c0..f3177a48 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ <%- brand %>