diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94ebcc9e..1db3f3eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,6 @@ jobs: strategy: matrix: php-version: ['8.0', '8.1'] - continue-on-error: ${{ matrix.php-version == '8.1' }} steps: - name: Checkout code uses: actions/checkout@v2 @@ -61,10 +60,7 @@ jobs: extensions: openswoole-4.8.1 coverage: pcov ini-values: pcov.directory=module - - if: ${{ matrix.php-version == '8.1' }} - run: composer install --no-interaction --prefer-dist --ignore-platform-req=php - - if: ${{ matrix.php-version != '8.1' }} - run: composer install --no-interaction --prefer-dist + - run: composer install --no-interaction --prefer-dist - run: composer test:unit:ci - uses: actions/upload-artifact@v2 if: ${{ matrix.php-version == '8.0' }} @@ -79,7 +75,6 @@ jobs: strategy: matrix: php-version: ['8.0', '8.1'] - continue-on-error: ${{ matrix.php-version == '8.1' }} steps: - name: Checkout code uses: actions/checkout@v2 @@ -91,10 +86,7 @@ jobs: extensions: openswoole-4.8.1 coverage: pcov ini-values: pcov.directory=module - - if: ${{ matrix.php-version == '8.1' }} - run: composer install --no-interaction --prefer-dist --ignore-platform-req=php - - if: ${{ matrix.php-version != '8.1' }} - run: composer install --no-interaction --prefer-dist + - run: composer install --no-interaction --prefer-dist - run: composer test:db:sqlite:ci - uses: actions/upload-artifact@v2 if: ${{ matrix.php-version == '8.0' }} @@ -109,7 +101,6 @@ jobs: strategy: matrix: php-version: ['8.0', '8.1'] - continue-on-error: ${{ matrix.php-version == '8.1' }} steps: - name: Checkout code uses: actions/checkout@v2 @@ -122,10 +113,7 @@ jobs: tools: composer extensions: openswoole-4.8.1 coverage: none - - if: ${{ matrix.php-version == '8.1' }} - run: composer install --no-interaction --prefer-dist --ignore-platform-req=php - - if: ${{ matrix.php-version != '8.1' }} - run: composer install --no-interaction --prefer-dist + - run: composer install --no-interaction --prefer-dist - run: composer test:db:mysql db-tests-maria: @@ -133,7 +121,6 @@ jobs: strategy: matrix: php-version: ['8.0', '8.1'] - continue-on-error: ${{ matrix.php-version == '8.1' }} steps: - name: Checkout code uses: actions/checkout@v2 @@ -146,10 +133,7 @@ jobs: tools: composer extensions: openswoole-4.8.1 coverage: none - - if: ${{ matrix.php-version == '8.1' }} - run: composer install --no-interaction --prefer-dist --ignore-platform-req=php - - if: ${{ matrix.php-version != '8.1' }} - run: composer install --no-interaction --prefer-dist + - run: composer install --no-interaction --prefer-dist - run: composer test:db:maria db-tests-postgres: @@ -157,7 +141,6 @@ jobs: strategy: matrix: php-version: ['8.0', '8.1'] - continue-on-error: ${{ matrix.php-version == '8.1' }} steps: - name: Checkout code uses: actions/checkout@v2 @@ -170,10 +153,7 @@ jobs: tools: composer extensions: openswoole-4.8.1 coverage: none - - if: ${{ matrix.php-version == '8.1' }} - run: composer install --no-interaction --prefer-dist --ignore-platform-req=php - - if: ${{ matrix.php-version != '8.1' }} - run: composer install --no-interaction --prefer-dist + - run: composer install --no-interaction --prefer-dist - run: composer test:db:postgres db-tests-ms: @@ -181,7 +161,6 @@ jobs: strategy: matrix: php-version: ['8.0', '8.1'] - continue-on-error: ${{ matrix.php-version == '8.1' }} env: LC_ALL: C steps: @@ -198,10 +177,7 @@ jobs: tools: composer extensions: openswoole-4.8.1, pdo_sqlsrv-5.10.0beta2 coverage: none - - if: ${{ matrix.php-version == '8.1' }} - run: composer install --no-interaction --prefer-dist --ignore-platform-req=php - - if: ${{ matrix.php-version != '8.1' }} - run: composer install --no-interaction --prefer-dist + - run: composer install --no-interaction --prefer-dist - name: Create test database run: docker-compose exec -T shlink_db_ms /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Passw0rd!' -Q "CREATE DATABASE shlink_test;" - run: composer test:db:ms @@ -211,7 +187,6 @@ jobs: strategy: matrix: php-version: ['8.0', '8.1'] - continue-on-error: ${{ matrix.php-version == '8.1' }} steps: - name: Checkout code uses: actions/checkout@v2 @@ -225,10 +200,7 @@ jobs: extensions: openswoole-4.8.1 coverage: pcov ini-values: pcov.directory=module - - if: ${{ matrix.php-version == '8.1' }} - run: composer install --no-interaction --prefer-dist --ignore-platform-req=php - - if: ${{ matrix.php-version != '8.1' }} - run: composer install --no-interaction --prefer-dist + - run: composer install --no-interaction --prefer-dist - run: bin/test/run-api-tests.sh - uses: actions/upload-artifact@v2 if: ${{ matrix.php-version == '8.0' }} @@ -248,7 +220,6 @@ jobs: matrix: php-version: ['8.0', '8.1'] test-group: ['unit', 'db'] - continue-on-error: ${{ matrix.php-version == '8.1' }} steps: - name: Checkout code uses: actions/checkout@v2 @@ -260,10 +231,7 @@ jobs: extensions: openswoole-4.8.1 coverage: pcov ini-values: pcov.directory=module - - if: ${{ matrix.php-version == '8.1' }} - run: composer install --no-interaction --prefer-dist --ignore-platform-req=php - - if: ${{ matrix.php-version != '8.1' }} - run: composer install --no-interaction --prefer-dist + - run: composer install --no-interaction --prefer-dist - uses: actions/download-artifact@v2 with: path: build diff --git a/CHANGELOG.md b/CHANGELOG.md index b7f49abe..c27aabcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this ### Added * [#1204](https://github.com/shlinkio/shlink/issues/1204) Added support for `openswoole` and migrated official docker image to `openswoole`. * [#1242](https://github.com/shlinkio/shlink/issues/1242) Added support to import urls and visits from YOURLS. + + In order to do it, you need to first install this [dedicated plugin](https://slnk.to/yourls-import) in YOURLS, and then run the `short-url:import yourls` command, as with any other source. + * [#1235](https://github.com/shlinkio/shlink/issues/1235) Added support to disable rounding QR codes block sizing via config option, env var or query param. +* [#1188](https://github.com/shlinkio/shlink/issues/1188) Added support for PHP 8.1. + + The official docker image has also been updated to use PHP 8.1 by default. ### Changed * [#1218](https://github.com/shlinkio/shlink/issues/1218) Updated to symfony/mercure 0.6.