Skip to content

Commit

Permalink
Merge pull request #10396 from danog/fix_circleci
Browse files Browse the repository at this point in the history
Fix circleci builds
  • Loading branch information
orklah authored Nov 22, 2023
2 parents d92523d + 29ac774 commit 2897ba6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ executors:
php-81:
docker:
- image: thecodingmachine/php:8.1-v4-cli
php-82:
docker:
- image: thecodingmachine/php:8.2-v4-cli
jobs:
"Code Style Analysis":
executor: php-74
Expand Down Expand Up @@ -67,7 +70,7 @@ jobs:
# The resource_class feature allows configuring CPU and RAM resources for each job. Different resource classes are available for different executors. https://circleci.com/docs/2.0/configuration-reference/#resourceclass
resource_class: large
test-with-real-projects:
executor: php-81
executor: php-82
steps:
- checkout # used here just for the side effect of loading the github public ssh key so we can clone other stuff
- attach_workspace:
Expand Down
1 change: 1 addition & 0 deletions bin/test-with-real-projects.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ psl)
cd endtoend-test-psl
git checkout 2.3.x
composer install
sed 's/ErrorOutputBehavior::Packed, ErrorOutputBehavior::Discard/ErrorOutputBehavior::Discard/g' -i src/Psl/Shell/execute.php
"$PSALM" --monochrome -c config/psalm.xml
"$PSALM" --monochrome -c config/psalm.xml tests/static-analysis
;;
Expand Down

0 comments on commit 2897ba6

Please sign in to comment.