From f546a2fe14434f63685ad5db7c9b807cc865c550 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 1 Feb 2024 13:57:51 +0100 Subject: [PATCH] fix(ci): Disable coverage on pull requests Co-authored-by: Ferdinand Thiessen Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com> Signed-off-by: Ferdinand Thiessen --- .github/workflows/files-external-s3.yml | 4 ++-- .github/workflows/files-external-webdav.yml | 4 ++-- autotest-external.sh | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/files-external-s3.yml b/.github/workflows/files-external-s3.yml index 2aa1fa37a56..7efdde88da8 100644 --- a/.github/workflows/files-external-s3.yml +++ b/.github/workflows/files-external-s3.yml @@ -42,8 +42,8 @@ jobs: matrix: php-versions: ['8.0', '8.1', '8.2', '8.3'] include: - - php-versions: '8.3' - coverage: true + - php-versions: '8.2' + coverage: ${{ github.event_name != 'pull_request' }} name: php${{ matrix.php-versions }}-s3 diff --git a/.github/workflows/files-external-webdav.yml b/.github/workflows/files-external-webdav.yml index 10fe68f68fe..46d1226a83c 100644 --- a/.github/workflows/files-external-webdav.yml +++ b/.github/workflows/files-external-webdav.yml @@ -42,8 +42,8 @@ jobs: matrix: php-versions: ['8.0', '8.1', '8.2', '8.3'] include: - - php-versions: '8.3' - coverage: true + - php-versions: '8.2' + coverage: ${{ github.event_name != 'pull_request' }} name: php${{ matrix.php-versions }}-webdav diff --git a/autotest-external.sh b/autotest-external.sh index ca5e2c2fa0b..fb768b26636 100755 --- a/autotest-external.sh +++ b/autotest-external.sh @@ -35,7 +35,7 @@ if ! [ -x "$PHPUNIT" ]; then if [ -x "$PWD/build/integration/vendor/phpunit/phpunit/phpunit" ]; then PHPUNIT="$PWD/build/integration/vendor/phpunit/phpunit/phpunit" else - echo "phpunit executable not found, please install phpunit version >= 9.6" >&2 + echo "phpunit executable not found, please install phpunit version >= 9.0" >&2 exit 3 fi fi @@ -44,8 +44,8 @@ PHPUNIT_VERSION=$("$PHPUNIT" --version | cut -d" " -f2) PHPUNIT_MAJOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f1) PHPUNIT_MINOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f2) -if ! [ $PHPUNIT_MAJOR_VERSION -gt 9 -o \( $PHPUNIT_MAJOR_VERSION -eq 9 -a $PHPUNIT_MINOR_VERSION -ge 6 \) ]; then - echo "phpunit version >= 9.6 required. Version found: $PHPUNIT_VERSION" >&2 +if ! [ $PHPUNIT_MAJOR_VERSION -gt 9 -o \( $PHPUNIT_MAJOR_VERSION -eq 9 -a $PHPUNIT_MINOR_VERSION -ge 0 \) ]; then + echo "phpunit version >= 9.0 required. Version found: $PHPUNIT_VERSION" >&2 exit 4 fi -- 2.39.5