Skip to content

Commit

Permalink
Merge branch 'main' into feat/org-name-support
Browse files Browse the repository at this point in the history
  • Loading branch information
evansims committed Jul 18, 2023
2 parents e87a06b + eddb7b4 commit 7be313c
Show file tree
Hide file tree
Showing 11 changed files with 87 additions and 20 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/cron_semgrep.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "Semgrep (Scheduled)"

# This workflow will run after a push to the main branch and as a scheduled job.

on:
push:
branches:
- main
schedule:
- cron: "30 0 1,15 * *"

permissions: {}

jobs:
semgrep:
name: "Scan"
runs-on: ubuntu-latest

container:
image: returntocorp/semgrep

steps:
- uses: actions/checkout@v3

- run: semgrep ci
env:
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
9 changes: 6 additions & 3 deletions .github/workflows/cron_snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ name: "Snyk (Scheduled)"

on:
push:
branches: ["master", "main"]
branches:
- main
schedule:
- cron: "30 0 1,15 * *"

permissions: {}

Expand All @@ -14,7 +17,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: shivammathur/setup-php@v2
- uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # [email protected]
with:
php-version: "8.1"
coverage: none
Expand All @@ -26,7 +29,7 @@ jobs:

- run: composer install --no-progress

- uses: snyk/actions/php@master
- uses: snyk/actions/php@b98d498629f1c368650224d6d212bf7dfa89e4bf # [email protected]
continue-on-error: true
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
6 changes: 5 additions & 1 deletion .github/workflows/pr_await_changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ name: "Pull Request Changes"

on:
pull_request:
types: [opened, synchronize, reopened, closed]
types:
- opened
- synchronize
- reopened
- closed

permissions: {}

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pr_composer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
pull_request:
merge_group:
push:
branches: ["master", "main"]
branches:
- main

permissions: {}

Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/pr_pest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
pull_request:
merge_group:
push:
branches: ["master", "main"]
branches:
- main

permissions: {}

Expand All @@ -16,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: shivammathur/setup-php@v2
- uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # [email protected]
with:
php-version: "8.1"
coverage: pcov
Expand All @@ -25,7 +26,7 @@ jobs:

- run: vendor/bin/pest --order-by random --fail-on-risky --stop-on-defect --coverage --parallel

- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # [email protected]
with:
directory: ./coverage/
flags: unittests
5 changes: 3 additions & 2 deletions .github/workflows/pr_phpcsf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
pull_request:
merge_group:
push:
branches: ["master", "main"]
branches:
- main

permissions: {}

Expand All @@ -16,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: shivammathur/setup-php@v2
- uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # [email protected]
with:
php-version: "8.1"

Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/pr_phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
pull_request:
merge_group:
push:
branches: ["master", "main"]
branches:
- main

permissions: {}

Expand All @@ -16,10 +17,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: shivammathur/setup-php@v2
- uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # [email protected]
with:
php-version: "8.1"

- run: composer install --no-progress

# - run: vendor/bin/phpstan analyze --no-ansi --no-progress --debug
- run: vendor/bin/phpstan analyze --no-ansi --no-progress --debug
7 changes: 4 additions & 3 deletions .github/workflows/pr_psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
pull_request:
merge_group:
push:
branches: ["master", "main"]
branches:
- main

permissions: {}

Expand All @@ -16,10 +17,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: shivammathur/setup-php@v2
- uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # [email protected]
with:
php-version: "8.1"

- run: composer install --no-progress

# - run: vendor/bin/psalm
- run: vendor/bin/psalm
5 changes: 3 additions & 2 deletions .github/workflows/pr_rector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
pull_request:
merge_group:
push:
branches: ["master", "main"]
branches:
- main

permissions: {}

Expand All @@ -16,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: shivammathur/setup-php@v2
- uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # [email protected]
with:
php-version: "8.1"

Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/pr_semgrep.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "Semgrep"

on:
workflow_run:
workflows: ["Pull Request Changes"]
types:
- completed

permissions: {}

jobs:
wait:
name: "Scan"
runs-on: ubuntu-latest

container:
image: returntocorp/semgrep

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

- run: semgrep ci
env:
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/pr_snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: shivammathur/setup-php@v2
- uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # [email protected]
with:
php-version: "8.1"
coverage: none
Expand All @@ -29,7 +29,7 @@ jobs:

- run: composer install --no-progress

- uses: snyk/actions/php@master
- uses: snyk/actions/php@b98d498629f1c368650224d6d212bf7dfa89e4bf # [email protected]
continue-on-error: true
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

0 comments on commit 7be313c

Please sign in to comment.