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

Update native deps for PHP 8.3 preparation

Browse Source
This commit is contained in:
Alejandro Celaya
2023-11-08 18:51:03 +01:00
parent d6fedaf926
commit 14c68b4bbe
12 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-db-tests.yml vendored
View File

@@ -28,7 +28,7 @@ jobs:
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.0.0, pdo_sqlsrv-5.10.1 php-extensions: openswoole-22.1.0, pdo_sqlsrv-5.11.1
extensions-cache-key: db-tests-extensions-${{ matrix.php-version }}-${{ inputs.platform }} extensions-cache-key: db-tests-extensions-${{ matrix.php-version }}-${{ inputs.platform }}
- name: Create test database - name: Create test database
if: ${{ inputs.platform == 'ms' }} if: ${{ inputs.platform == 'ms' }}

2
.github/workflows/ci-mutation-tests.yml vendored
View File

@@ -20,7 +20,7 @@ jobs:
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.0.0 php-extensions: openswoole-22.1.0
extensions-cache-key: mutation-tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }} extensions-cache-key: mutation-tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }}
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
with: with:

2
.github/workflows/ci-tests.yml vendored
View File

@@ -26,7 +26,7 @@ jobs:
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.0.0 php-extensions: openswoole-22.1.0
extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }} extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }}
- run: composer test:${{ inputs.test-group }}:ci - run: composer test:${{ inputs.test-group }}:ci
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3

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

@@ -36,7 +36,7 @@ jobs:
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.0.0 php-extensions: openswoole-22.1.0
extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ matrix.command }} extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ matrix.command }}
- run: composer ${{ matrix.command }} - run: composer ${{ matrix.command }}

7
.github/workflows/publish-release.yml vendored
View File

@@ -12,17 +12,12 @@ jobs:
matrix: matrix:
php-version: ['8.2', '8.3'] php-version: ['8.2', '8.3']
swoole: ['yes', 'no'] swoole: ['yes', 'no']
exclude:
# Openswoole does not support PHP 8.3, so lets not build for that combination
# Next Shlink version (4.0.0) is completely dropping support for openswoole and we will be able to remove this
- php-version: '8.3'
swoole: 'yes'
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.0.0 php-extensions: openswoole-22.1.0
extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }} extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }}
install-deps: 'no' install-deps: 'no'
- if: ${{ matrix.swoole == 'yes' }} - if: ${{ matrix.swoole == 'yes' }}

2
.github/workflows/publish-swagger-spec.yml vendored
View File

@@ -20,7 +20,7 @@ jobs:
- uses: './.github/actions/ci-setup' - uses: './.github/actions/ci-setup'
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
php-extensions: openswoole-22.0.0 php-extensions: openswoole-22.1.0
extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }} extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }}
- run: composer swagger:inline - run: composer swagger:inline
- run: mkdir ${{ steps.determine_version.outputs.version }} - run: mkdir ${{ steps.determine_version.outputs.version }}

4
Dockerfile
View File

@@ -7,8 +7,8 @@ ENV SHLINK_RUNTIME ${SHLINK_RUNTIME}
ARG SHLINK_USER_ID='root' ARG SHLINK_USER_ID='root'
ENV SHLINK_USER_ID ${SHLINK_USER_ID} ENV SHLINK_USER_ID ${SHLINK_USER_ID}
ENV OPENSWOOLE_VERSION 22.0.0 ENV OPENSWOOLE_VERSION 22.1.0
ENV PDO_SQLSRV_VERSION 5.10.1 ENV PDO_SQLSRV_VERSION 5.11.1
ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 ENV MS_ODBC_SQL_VERSION 18_18.1.1.1
ENV LC_ALL 'C' ENV LC_ALL 'C'

3
build.sh
View File

@@ -31,7 +31,8 @@ cd "${builtContent}"
# Install dependencies # Install dependencies
echo "Installing dependencies with $composerBin..." echo "Installing dependencies with $composerBin..."
composerFlags="--optimize-autoloader --no-progress --no-interaction" # Deprecated. Do not ignore PHP platform req for Shlink v4.0.0
composerFlags="--optimize-autoloader --no-progress --no-interaction --ignore-platform-req=php+"
${composerBin} self-update ${composerBin} self-update
${composerBin} install --no-dev --prefer-dist $composerFlags ${composerBin} install --no-dev --prefer-dist $composerFlags

2
composer.json
View File

@@ -37,7 +37,7 @@
"lstrojny/functional-php": "^1.17", "lstrojny/functional-php": "^1.17",
"mezzio/mezzio": "^3.17", "mezzio/mezzio": "^3.17",
"mezzio/mezzio-fastroute": "^3.10", "mezzio/mezzio-fastroute": "^3.10",
"mezzio/mezzio-problem-details": "^1.12", "mezzio/mezzio-problem-details": "^1.13",
"mezzio/mezzio-swoole": "^4.7", "mezzio/mezzio-swoole": "^4.7",
"mlocati/ip-lib": "^1.18", "mlocati/ip-lib": "^1.18",
"mobiledetect/mobiledetectlib": "^3.74", "mobiledetect/mobiledetectlib": "^3.74",

2
data/infra/php.Dockerfile
View File

@@ -2,7 +2,7 @@ FROM php:8.2-fpm-alpine3.17
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.21 ENV APCU_VERSION 5.1.21
ENV PDO_SQLSRV_VERSION 5.10.1 ENV PDO_SQLSRV_VERSION 5.11.1
ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 ENV MS_ODBC_SQL_VERSION 18_18.1.1.1

2
data/infra/roadrunner.Dockerfile
View File

@@ -2,7 +2,7 @@ FROM php:8.2-alpine3.17
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.21 ENV APCU_VERSION 5.1.21
ENV PDO_SQLSRV_VERSION 5.10.1 ENV PDO_SQLSRV_VERSION 5.11.1
ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 ENV MS_ODBC_SQL_VERSION 18_18.1.1.1

4
data/infra/swoole.Dockerfile
View File

@@ -3,8 +3,8 @@ MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
ENV APCU_VERSION 5.1.21 ENV APCU_VERSION 5.1.21
ENV INOTIFY_VERSION 3.0.0 ENV INOTIFY_VERSION 3.0.0
ENV OPENSWOOLE_VERSION 22.0.0 ENV OPENSWOOLE_VERSION 22.1.0
ENV PDO_SQLSRV_VERSION 5.10.1 ENV PDO_SQLSRV_VERSION 5.11.1
ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486' ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
ENV MS_ODBC_SQL_VERSION 18_18.1.1.1 ENV MS_ODBC_SQL_VERSION 18_18.1.1.1