diff options
| author | Robin Appelman <robin@icewind.nl> | 2022-04-13 15:20:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-13 15:20:48 +0300 |
| commit | 0d63038d90e48517247c9ebf9f423b073132759c (patch) | |
| tree | e3aaf6f862c7c5427ad9b5d57226f4f115c29999 | |
| parent | 2caf97640efcb4f2b95c0de7e1da72a9b54b5d27 (diff) | |
| parent | 770b016916894d01b70ecc18301bc1bca71c615f (diff) | |
Merge pull request #226 from nextcloud/fix/php7.3-ci
Fix lint checks on PHP 7.3 CI
| -rw-r--r-- | .github/workflows/lint.yml | 24 | ||||
| -rw-r--r-- | composer.json | 2 |
2 files changed, 20 insertions, 6 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bfe7578..617f20e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,18 +11,32 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['7.3', '7.4', '8.0'] - name: php${{ matrix.php-versions }} lint + php-version: ['7.4', '8.0'] + ocp-version: ['^v21.0.0', '^v22.0.0', '^v23.0.0', 'dev-master'] + include: + - php-version: '7.3' + ocp-version: '^v21.0.0' + - php-version: '7.3' + ocp-version: '^v22.0.0' + - php-version: '7.3' + ocp-version: '^v23.0.0' + - php-version: '8.1' + ocp-version: 'dev-master' + name: php${{ matrix.php-version }}-ocp-${{ matrix.ocp-version }} lint steps: - name: Checkout uses: actions/checkout@master - - name: Set up php${{ matrix.php-versons }} + - name: Set up php${{ matrix.php-version }} uses: shivammathur/setup-php@master with: - php-version: ${{ matrix.php-versions }} + php-version: ${{ matrix.php-version }} coverage: none - name: Install dependencies - run: composer i + run: composer i --ignore-platform-reqs + - name: Install OCP package + run: | + rm composer.lock + composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }} - name: Lint run: composer run lint diff --git a/composer.json b/composer.json index 8286aa0..f362e44 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require-dev": { - "christophwurst/nextcloud": "dev-master", + "christophwurst/nextcloud": "^v20.0.0", "php-parallel-lint/php-parallel-lint": "^1.0", "phpunit/phpunit": "^8", "nextcloud/coding-standard": "^0.4.0" |