Skip to content

Commit df1a444

Browse files
committed
Update test scripts
1 parent bed4a55 commit df1a444

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- PHP_VERSION: '7.4'
3333
- PHP_VERSION: '8.0'
3434
- PHP_VERSION: '8.1'
35-
- PHP_VERSION: '8.2.0RC2'
35+
- PHP_VERSION: '8.2.0RC3'
3636

3737
# Steps represent a sequence of tasks that will be executed as part of the job
3838
steps:

ci/run_phpstan_dockerized.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
if [ $# != 1 ]; then
33
echo "Usage: $0 PHP_VERSION" 1>&2
44
echo "e.g. $0 8.0" 1>&2
5-
echo "The PHP_VERSION is the version of the php docker image to use to run phpstan" 1>&2
6-
echo "This runs the tests that have been set up in GitHub Workflows so far" 1>&2
5+
echo "The PHP_VERSION is the version of the php docker image to use to run phpstan (static analysis)" 1>&2
76
exit 1
87
fi
98
# -x Exit immediately if any command fails
@@ -12,6 +11,7 @@ fi
1211
set -xeu
1312
PHP_VERSION=$1
1413

14+
# This is the same image name, Dockerfile and build arguments as ci/run_tests_dockerized.sh
1515
DOCKER_IMAGE="tolerant-php-parser-test-runner:$PHP_VERSION"
1616
docker build --build-arg="PHP_VERSION=$PHP_VERSION" --tag="$DOCKER_IMAGE" -f ci/Dockerfile .
1717
docker run --rm $DOCKER_IMAGE ci/run_phpstan.sh

ci/run_tests_dockerized.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ fi
1111
# -u fail for undefined variables
1212
set -xeu
1313
PHP_VERSION=$1
14-
COMPOSER_OPTIONS=""
15-
# lexicographic comparison
16-
if [ "$PHP_VERSION" > "8.1" ]; then
17-
COMPOSER_OPTIONS="--ignore-platform-reqs"
18-
fi
1914

2015
DOCKER_IMAGE="tolerant-php-parser-test-runner:$PHP_VERSION"
21-
docker build --build-arg="PHP_VERSION=$PHP_VERSION" --build-arg="COMPOSER_OPTIONS=$COMPOSER_OPTIONS" --tag="$DOCKER_IMAGE" -f ci/Dockerfile .
16+
docker build --build-arg="PHP_VERSION=$PHP_VERSION" --tag="$DOCKER_IMAGE" -f ci/Dockerfile .
2217
docker run --rm $DOCKER_IMAGE ci/run_tests.sh

0 commit comments

Comments
 (0)