diff --git a/.github/workflows/deploy-pr.yml b/.github/workflows/deploy-pr.yml index 874523819..b5e8d15b2 100644 --- a/.github/workflows/deploy-pr.yml +++ b/.github/workflows/deploy-pr.yml @@ -5,6 +5,14 @@ name: deploy on: + pull_request: + branches: [ main ] + types: + - labeled + - opened + - synchronize + - reopened + - ready_for_review pull_request_target: branches: [ main ] types: @@ -24,7 +32,7 @@ env: jobs: deploy: - if: github.event.pull_request.draft == false || contains( github.event.pull_request.labels.*.name, 'FORCE DEPLOY') + if: (github.event.pull_request.draft == false || contains( github.event.pull_request.labels.*.name, 'FORCE DEPLOY')) && (github.event_name == 'pull_request_target') == github.event.pull_request.head.repo.fork runs-on: ubuntu-latest name: Deploys to netlify env: diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 1e36dd2db..496f68ad7 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -9,6 +9,8 @@ on: branches: [ main ] pull_request_target: branches: [ main ] + pull_request: + branches: [ main ] permissions: contents: read @@ -19,6 +21,7 @@ env: jobs: build-frontend: + if: "${{ (github.event_name == 'pull_request_target') == github.event.pull_request.head.repo.fork }}" runs-on: ubuntu-latest name: Build test build of frontend steps: