Skip to content

Commit

Permalink
Do not use environment protection rule, rely on workflow run
Browse files Browse the repository at this point in the history
  • Loading branch information
LauraBeatris committed Dec 9, 2024
1 parent 9f0993f commit 9b71e9c
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
workflow_dispatch:
merge_group:
pull_request_target:
types: [opened, synchronize]
branches:
- main
- release/v4
Expand All @@ -13,7 +14,7 @@ concurrency:
cancel-in-progress: true

jobs:
# Check triggering actor permissions to prevent PRs from forks accessing secrets by default, preventing them from exfiltrating secrets for malicious purposes
# Check triggering actor permissions to prevent PRs from forks accessing secrets by default, preventing them from accessing secrets for malicious purposes
check-permissions:
runs-on: 'blacksmith-8vcpu-ubuntu-2204'
steps:
Expand All @@ -34,7 +35,7 @@ jobs:
exit 1
formatting-linting:
needs: [check-approval]
needs: [check-permissions]
name: Formatting, linting & changeset checks
runs-on: 'blacksmith-8vcpu-ubuntu-2204'
timeout-minutes: ${{ vars.TIMEOUT_MINUTES_NORMAL && fromJSON(vars.TIMEOUT_MINUTES_NORMAL) || 10 }}
Expand All @@ -48,6 +49,7 @@ jobs:
with:
fetch-depth: 0
show-progress: false
ref: ${{ github.event.pull_request.head.sha }}

- name: Setup
id: config
Expand Down Expand Up @@ -101,7 +103,7 @@ jobs:
retention-days: 5

unit-tests:
needs: [check-approval]
needs: [check-permissions]
name: Unit Tests
runs-on: 'blacksmith-8vcpu-ubuntu-2204'
timeout-minutes: ${{ vars.TIMEOUT_MINUTES_NORMAL && fromJSON(vars.TIMEOUT_MINUTES_NORMAL) || 10 }}
Expand All @@ -119,6 +121,7 @@ jobs:
with:
fetch-depth: 0
show-progress: false
ref: ${{ github.event.pull_request.head.sha }}

- name: Setup
id: config
Expand Down Expand Up @@ -153,7 +156,7 @@ jobs:
retention-days: 5

integration-tests:
needs: [check-approval]
needs: [check-permissions]
name: Integration Tests
runs-on: 'blacksmith-8vcpu-ubuntu-2204'
timeout-minutes: ${{ vars.TIMEOUT_MINUTES_LONG && fromJSON(vars.TIMEOUT_MINUTES_LONG) || 15 }}
Expand All @@ -180,6 +183,7 @@ jobs:
with:
fetch-depth: 0
show-progress: false
ref: ${{ github.event.pull_request.head.sha }}

- name: Setup
id: config
Expand Down

0 comments on commit 9b71e9c

Please sign in to comment.