Skip to content

Commit

Permalink
Merge branch '4.x' into feature/4.x/add-phpstan-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
millnut committed Sep 14, 2024
2 parents 5d25dca + f608954 commit cd52f99
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/localgov_microsites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:
pull_request:
branches:
- '4.x'
schedule:
- cron: '0 6 * * *'
workflow_dispatch:

env:
Expand All @@ -32,6 +34,7 @@ jobs:
php-version:
- '8.1'
- '8.2'
- '8.3'

steps:

Expand Down Expand Up @@ -94,8 +97,7 @@ jobs:
drupal-version:
- '~10.0'
php-version:
- '8.1'
- '8.2'
- '8.3'

steps:

Expand All @@ -118,7 +120,7 @@ jobs:
./bin/phpcs -p ${LOCALGOV_DRUPAL_PROJECT_PATH}
phpstan:
name: Deprecated code checks
name: Static analysis checks
needs: build
runs-on: ubuntu-latest

Expand All @@ -130,8 +132,7 @@ jobs:
drupal-version:
- '~10.0'
php-version:
- '8.1'
- '8.2'
- '8.3'

steps:

Expand Down Expand Up @@ -167,6 +168,7 @@ jobs:
php-version:
- '8.1'
- '8.2'
- '8.3'

steps:

Expand All @@ -185,7 +187,7 @@ jobs:
localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
- name: Start Docker environment
run: docker-compose -f docker-compose.yml up -d
run: docker compose -f docker-compose.yml up -d

- name: Run PHPUnit tests
run: |
Expand Down
4 changes: 0 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
"require-dev": {
"brianium/paratest": "^6.3",
"drupal/core-dev": "^10.0",
"mglaman/phpstan-drupal": "^1.1",
"phpspec/prophecy-phpunit": "^2",
"phpstan/phpstan": "^1.5",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-strict-rules": "^1.5",
"spaze/phpstan-disallowed-calls": "^3.4"
},
Expand Down

0 comments on commit cd52f99

Please sign in to comment.