OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added experimental builds under PHP 8.1

Browse Source
This commit is contained in:
Alejandro Celaya 2021-09-26 09:49:51 +02:00
parent 7db6136436
commit f5aaf298e1
3 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
.github/workflows/ci.yml vendored
View File

@ -48,7 +48,8 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
php-version: ['8.0'] php-version: ['8.0', '8.1']
continue-on-error: ${{ matrix.php-version == '8.1' }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -60,7 +61,10 @@ jobs:
extensions: swoole-4.6.7 extensions: swoole-4.6.7
coverage: pcov coverage: pcov
ini-values: pcov.directory=module ini-values: pcov.directory=module
- run: composer install --no-interaction --prefer-dist - 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 test:unit:ci - run: composer test:unit:ci
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
if: ${{ matrix.php-version == '8.0' }} if: ${{ matrix.php-version == '8.0' }}
@ -74,7 +78,8 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
php-version: ['8.0'] php-version: ['8.0', '8.1']
continue-on-error: ${{ matrix.php-version == '8.1' }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -86,7 +91,10 @@ jobs:
extensions: swoole-4.6.7 extensions: swoole-4.6.7
coverage: pcov coverage: pcov
ini-values: pcov.directory=module ini-values: pcov.directory=module
- run: composer install --no-interaction --prefer-dist - 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 test:db:sqlite:ci - run: composer test:db:sqlite:ci
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
if: ${{ matrix.php-version == '8.0' }} if: ${{ matrix.php-version == '8.0' }}
@ -100,7 +108,8 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
php-version: ['8.0'] php-version: ['8.0', '8.1']
continue-on-error: ${{ matrix.php-version == '8.1' }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -113,14 +122,18 @@ jobs:
tools: composer tools: composer
extensions: swoole-4.6.7 extensions: swoole-4.6.7
coverage: none coverage: none
- run: composer install --no-interaction --prefer-dist - 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 test:db:mysql - run: composer test:db:mysql
db-tests-maria: db-tests-maria:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
php-version: ['8.0'] php-version: ['8.0', '8.1']
continue-on-error: ${{ matrix.php-version == '8.1' }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -133,14 +146,18 @@ jobs:
tools: composer tools: composer
extensions: swoole-4.6.7 extensions: swoole-4.6.7
coverage: none coverage: none
- run: composer install --no-interaction --prefer-dist - 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 test:db:maria - run: composer test:db:maria
db-tests-postgres: db-tests-postgres:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
php-version: ['8.0'] php-version: ['8.0', '8.1']
continue-on-error: ${{ matrix.php-version == '8.1' }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -153,14 +170,18 @@ jobs:
tools: composer tools: composer
extensions: swoole-4.6.7 extensions: swoole-4.6.7
coverage: none coverage: none
- run: composer install --no-interaction --prefer-dist - 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 test:db:postgres - run: composer test:db:postgres
db-tests-ms: db-tests-ms:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
php-version: ['8.0'] php-version: ['8.0', '8.1']
continue-on-error: ${{ matrix.php-version == '8.1' }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -175,7 +196,10 @@ jobs:
tools: composer tools: composer
extensions: swoole-4.6.7, pdo_sqlsrv-5.9.0 extensions: swoole-4.6.7, pdo_sqlsrv-5.9.0
coverage: none coverage: none
- run: composer install --no-interaction --prefer-dist - 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
- name: Create test database - 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: 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 - run: composer test:db:ms
@ -184,7 +208,8 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
php-version: ['8.0'] php-version: ['8.0', '8.1']
continue-on-error: ${{ matrix.php-version == '8.1' }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -198,7 +223,10 @@ jobs:
extensions: swoole-4.6.7 extensions: swoole-4.6.7
coverage: pcov coverage: pcov
ini-values: pcov.directory=module ini-values: pcov.directory=module
- run: composer install --no-interaction --prefer-dist - 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: bin/test/run-api-tests.sh - run: bin/test/run-api-tests.sh
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
if: ${{ matrix.php-version == '8.0' }} if: ${{ matrix.php-version == '8.0' }}
@ -216,8 +244,9 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
php-version: ['8.0'] php-version: ['8.0', '8.1']
test-group: ['unit', 'db'] test-group: ['unit', 'db']
continue-on-error: ${{ matrix.php-version == '8.1' }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -229,7 +258,10 @@ jobs:
extensions: swoole-4.6.7 extensions: swoole-4.6.7
coverage: pcov coverage: pcov
ini-values: pcov.directory=module ini-values: pcov.directory=module
- run: composer install --no-interaction --prefer-dist - 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
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2
with: with:
path: build path: build

2
Dockerfile
View File

@ -2,7 +2,7 @@ FROM php:8.0.9-alpine3.14 as base
ARG SHLINK_VERSION=latest ARG SHLINK_VERSION=latest
ENV SHLINK_VERSION ${SHLINK_VERSION} ENV SHLINK_VERSION ${SHLINK_VERSION}
ENV SWOOLE_VERSION 4.7.0 ENV SWOOLE_VERSION 4.7.1
ENV PDO_SQLSRV_VERSION 5.9.0 ENV PDO_SQLSRV_VERSION 5.9.0
ENV MS_ODBC_SQL_VERSION 17.5.2.1 ENV MS_ODBC_SQL_VERSION 17.5.2.1
ENV LC_ALL "C" ENV LC_ALL "C"

2
data/infra/swoole.Dockerfile
View File

@ -4,7 +4,7 @@ MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.20 ENV APCU_VERSION 5.1.20
ENV PDO_SQLSRV_VERSION 5.9.0 ENV PDO_SQLSRV_VERSION 5.9.0
ENV INOTIFY_VERSION 3.0.0 ENV INOTIFY_VERSION 3.0.0
ENV SWOOLE_VERSION 4.7.0 ENV SWOOLE_VERSION 4.7.1
ENV MS_ODBC_SQL_VERSION 17.5.2.1 ENV MS_ODBC_SQL_VERSION 17.5.2.1
RUN apk update RUN apk update