Browse Source

Add prefer-lowest

Corey Taylor 5 years ago
parent
commit
a0421a718f
2 changed files with 15 additions and 50 deletions
  1. 15 9
      .github/workflows/ci.yml
  2. 0 41
      .travis.yml

+ 15 - 9
.github/workflows/ci.yml

@@ -17,7 +17,11 @@ jobs:
       matrix:
         php-version: ['5.6', '7.4']
         db-type: [sqlite, mysql, pgsql]
-    name: PHP ${{ matrix.php-version }} & ${{ matrix.db-type }}
+        prefer-lowest: ['']
+        include:
+          - php-version: '5.6'
+            db-type: 'mysql'
+            prefer-lowest: 'prefer-lowest'
 
     services:
       redis:
@@ -70,17 +74,19 @@ jobs:
       uses: actions/cache@v1
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}
+        key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
 
     - name: Install packages
       run: |
         sudo locale-gen da_DK.UTF-8
         sudo locale-gen de_DE.UTF-8
 
-    - name: composer install
+    - name: Composer install
       run: |
         if [[ ${{ matrix.php-version }} == '8.0' ]]; then
-          composer update --ignore-platform-reqs
+          composer install --ignore-platform-reqs
+        elif ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
+          composer update --prefer-lowest --prefer-stable
         else
           composer update
         fi
@@ -91,7 +97,7 @@ jobs:
 
     - name: Configure PHPUnit matcher
       if: matrix.php-version == '7.4' && matrix.db-type == 'mysql'
-      uses: mheap/phpunit-matcher-action@master
+      run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
     - name: Run PHPUnit
       env:
@@ -110,7 +116,7 @@ jobs:
         fi
 
     - name: Submit code coverage
-      if: success() && matrix.php-version == '7.4'
+      if: matrix.php-version == '7.4'
       uses: codecov/codecov-action@v1
 
   testsuite-windows:
@@ -169,9 +175,9 @@ jobs:
       uses: actions/cache@v1
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}
+        key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
 
-    - name: composer install
+    - name: Composer install
       run: composer update
 
     - name: Run PHPUnit
@@ -210,7 +216,7 @@ jobs:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}
 
-    - name: composer install
+    - name: Composer install
       run: |
         composer update
         composer phpstan-setup

+ 0 - 41
.travis.yml

@@ -1,41 +0,0 @@
-language: php
-
-dist: xenial
-
-services:
-  - memcached
-  - redis-server
-
-cache:
-  directories:
-    - vendor
-    - $HOME/.composer/cache
-
-matrix:
-  include:
-    - php: 5.6
-      env: PREFER_LOWEST=1 DB=sqlite db_dsn='sqlite:///:memory:'
-
-before_install:
-  - echo cakephp version && tail -1 VERSION.txt
-  - phpenv config-rm xdebug.ini
-
-  - echo 'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - echo 'extension = apcu.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - echo 'apc.enable_cli = 1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-
-  - echo "yes" | pecl install apcu-4.0.11 || true
-
-  - sudo locale-gen da_DK
-  - sudo locale-gen de_DE
-
-before_script:
-  - composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction
-  - composer require --dev dereuromark/composer-prefer-lowest
-
-script:
-  - vendor/bin/phpunit
-  - vendor/bin/validate-prefer-lowest
-
-notifications:
-  email: false