From 3d0301d0a1f0fb266872dd2d7bf75377d1393bbd Mon Sep 17 00:00:00 2001 From: kacper Date: Mon, 27 Sep 2021 13:10:07 +0200 Subject: [PATCH 1/6] [CI] Moving jobs in ez-support-tools. --- .github/workflows/ci.yaml | 54 +++++++++++++++++++++++++++++++++++++++ .travis.yml | 2 -- composer.json | 4 ++- 3 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/ci.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 00000000..2cd1c865 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,54 @@ +name: CI + +on: + push: + branches: + - master + - '[0-9]+.[0-9]+' + pull_request: ~ + +env: + COMPOSER_ROOT_VERSION: 1.0.x-dev +jobs: + tests: + name: Tests + runs-on: "ubuntu-20.04" + timeout-minutes: 10 + continue-on-error: ${{ matrix.experimental }} + + strategy: + fail-fast: false + matrix: + php: + - '7.1' + - '7.2' + - '7.3' + - '7.4' + composer_options: [ "" ] + experimental: [false] + include: + - php: '8.0' + composer_options: "--ignore-platform-req php" + experimental: true + + steps: + - uses: actions/checkout@v2 + + - name: Setup PHP Action + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + coverage: none + extensions: redis + tools: cs2pr + + - uses: "ramsey/composer-install@v1" + with: + dependency-versions: "highest" + composer-options: "--prefer-dist --no-progress --no-suggest ${{ matrix.composer_options }}" + + - name: Setup problem matchers for PHPUnit + run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + + - name: Run code style check + run: composer run-script check-cs -- --format=checkstyle | cs2pr \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 3977fb81..908caf39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ matrix: fast_finish: true include: - php: 7.1 - env: CHECK_CS=true - php: 7.2 - php: 7.3 @@ -31,7 +30,6 @@ before_script: script: - php vendor/bin/phpunit - - if [ "$CHECK_CS" = "true" ]; then vendor/bin/php-cs-fixer fix -v --dry-run --diff --show-progress=estimating; fi notifications: email: false diff --git a/composer.json b/composer.json index acdb0571..05f39b2d 100644 --- a/composer.json +++ b/composer.json @@ -32,6 +32,8 @@ } }, "scripts": { - "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating" + "fix-cs": "php-cs-fixer fix -v --show-progress=estimating", + "check-cs": "@fix-cs --dry-run", + "test": "phpunit -c phpunit.xml" } } From ebaa05b57827e15742cb6367d6235cab010ea1fd Mon Sep 17 00:00:00 2001 From: kacper Date: Tue, 28 Sep 2021 09:39:12 +0200 Subject: [PATCH 2/6] Corrections. --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2cd1c865..ae556123 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,6 +47,9 @@ jobs: dependency-versions: "highest" composer-options: "--prefer-dist --no-progress --no-suggest ${{ matrix.composer_options }}" + - name: Run test suite + run: composer run-script --timeout=600 test + - name: Setup problem matchers for PHPUnit run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" From b210e96de1748c583c6b0b3f913a3e06c26fe3f3 Mon Sep 17 00:00:00 2001 From: kacper Date: Thu, 30 Sep 2021 13:21:54 +0200 Subject: [PATCH 3/6] Corrections in ci.yaml, deletion of .travis.yml. --- .github/workflows/ci.yaml | 8 ++++---- .travis.yml | 35 ----------------------------------- 2 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ae556123..91abe5da 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,11 +47,11 @@ jobs: dependency-versions: "highest" composer-options: "--prefer-dist --no-progress --no-suggest ${{ matrix.composer_options }}" - - name: Run test suite - run: composer run-script --timeout=600 test - - name: Setup problem matchers for PHPUnit run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + - name: Run test suite + run: composer run-script --timeout=600 test + - name: Run code style check - run: composer run-script check-cs -- --format=checkstyle | cs2pr \ No newline at end of file + run: composer run-script check-cs -- --format=checkstyle | cs2pr diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 908caf39..00000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -dist: xenial -sudo: required - -language: php - -cache: - directories: - - $HOME/.composer/cache/files - -matrix: - fast_finish: true - include: - - php: 7.1 - - php: 7.2 - - php: 7.3 - -# test only on matching branches (+ Pull requests) -branches: - only: - - master - - /^\d.\d+$/ - -before_script: - - travis_retry composer selfupdate - # Avoid memory issues on composer install - - phpenv config-rm xdebug.ini - - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - # Install packages - - travis_retry composer install --prefer-dist --no-interaction - -script: - - php vendor/bin/phpunit - -notifications: - email: false From fe9f332d0806ce9ae56efbdbd3138245174d1d1d Mon Sep 17 00:00:00 2001 From: kacper Date: Thu, 30 Sep 2021 13:25:32 +0200 Subject: [PATCH 4/6] Corrections in ci.yaml. --- .github/workflows/ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 91abe5da..6fbce89f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,13 +23,13 @@ jobs: - '7.1' - '7.2' - '7.3' - - '7.4' +# - '7.4' composer_options: [ "" ] experimental: [false] - include: - - php: '8.0' - composer_options: "--ignore-platform-req php" - experimental: true +# include: +# - php: '8.0' +# composer_options: "--ignore-platform-req php" +# experimental: true steps: - uses: actions/checkout@v2 From d7effedfe9abe226bf2ad9f30b945247062602d5 Mon Sep 17 00:00:00 2001 From: kacper Date: Thu, 30 Sep 2021 13:38:18 +0200 Subject: [PATCH 5/6] Corrections in ci.yaml. --- .github/workflows/ci.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6fbce89f..a2235e7d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,13 +23,8 @@ jobs: - '7.1' - '7.2' - '7.3' -# - '7.4' composer_options: [ "" ] experimental: [false] -# include: -# - php: '8.0' -# composer_options: "--ignore-platform-req php" -# experimental: true steps: - uses: actions/checkout@v2 From 2a2523eb9827f70c59edb13d218ebc294312967b Mon Sep 17 00:00:00 2001 From: kacper-wieczorek-ibexa <79905560+kacper-wieczorek-ibexa@users.noreply.github.com> Date: Wed, 6 Oct 2021 10:40:58 +0200 Subject: [PATCH 6/6] Update ci.yaml Correction in ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a2235e7d..af6c9270 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,7 +34,7 @@ jobs: with: php-version: ${{ matrix.php }} coverage: none - extensions: redis + extensions: pdo_sqlite, gd tools: cs2pr - uses: "ramsey/composer-install@v1"