Skip to content

Commit

Permalink
Update workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
evansims committed Aug 25, 2023
1 parent 28a5cef commit 4a97c25
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
Expand All @@ -38,6 +38,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- run: semgrep ci
env:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
Expand All @@ -35,6 +35,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: ./.github/actions/setup
with:
Expand Down
22 changes: 20 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
permissions: {}

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
Expand All @@ -35,6 +35,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- id: set-matrix
run: echo "matrix=$(jq -c . < ./.github/workflows/matrix.json)" >> $GITHUB_OUTPUT
Expand All @@ -50,6 +52,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: ./.github/actions/setup
with:
Expand All @@ -66,6 +70,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: ./.github/actions/setup
with:
Expand All @@ -84,12 +90,14 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: ./.github/actions/setup
with:
php: ${{ matrix.php }}

- run: composer validate --strict
- run: composer validate --strict --with-dependencies

pest:
name: PEST
Expand All @@ -102,6 +110,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: ./.github/actions/setup
with:
Expand All @@ -128,6 +138,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: ./.github/actions/setup
with:
Expand All @@ -146,6 +158,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: ./.github/actions/setup
with:
Expand All @@ -164,6 +178,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: ./.github/actions/setup
with:
Expand All @@ -182,6 +198,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: ./.github/actions/setup
with:
Expand Down

0 comments on commit 4a97c25

Please sign in to comment.