mirror of
https://github.com/shlinkio/shlink.git
synced 2024-11-26 06:43:56 +03:00
Updated dockerimages to PHP 8.2 and added full support for this version
This commit is contained in:
parent
27bf7220b9
commit
dab0ebeb99
7 changed files with 8 additions and 14 deletions
5
.github/actions/ci-setup/action.yml
vendored
5
.github/actions/ci-setup/action.yml
vendored
|
@ -41,10 +41,7 @@ runs:
|
||||||
extensions: ${{ inputs.php-extensions }}
|
extensions: ${{ inputs.php-extensions }}
|
||||||
coverage: pcov
|
coverage: pcov
|
||||||
ini-values: pcov.directory=module
|
ini-values: pcov.directory=module
|
||||||
- run: echo "::set-output name=composerArgs::${{ inputs.php-version == '8.2' && '--ignore-platform-req=php+' || '' }}"
|
|
||||||
id: composer_args
|
|
||||||
shell: bash
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
if: ${{ inputs.install-deps == 'yes' }}
|
if: ${{ inputs.install-deps == 'yes' }}
|
||||||
run: composer install --no-interaction --prefer-dist ${{ steps.composer_args.outputs.composerArgs }}
|
run: composer install --no-interaction --prefer-dist
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
|
@ -51,10 +51,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
php-version: ${{ matrix.php-version }}
|
php-version: ${{ matrix.php-version }}
|
||||||
tools: composer
|
tools: composer
|
||||||
- run: echo "::set-output name=composerArgs::${{ matrix.php-version == '8.2' && '--ignore-platform-req=php+' || '' }}"
|
- run: composer install --no-interaction --prefer-dist
|
||||||
id: composer_args
|
|
||||||
shell: bash
|
|
||||||
- run: composer install --no-interaction --prefer-dist ${{ steps.composer_args.outputs.composerArgs }}
|
|
||||||
- run: ./vendor/bin/rr get --no-interaction --location bin/ && chmod +x bin/rr
|
- run: ./vendor/bin/rr get --no-interaction --location bin/ && chmod +x bin/rr
|
||||||
- run: composer test:api:rr
|
- run: composer test:api:rr
|
||||||
|
|
||||||
|
|
4
.github/workflows/publish-release.yml
vendored
4
.github/workflows/publish-release.yml
vendored
|
@ -10,7 +10,7 @@ jobs:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
php-version: ['8.1']
|
php-version: ['8.1', '8.2']
|
||||||
swoole: ['yes', 'no']
|
swoole: ['yes', 'no']
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
@ -51,7 +51,7 @@ jobs:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
php-version: ['8.1']
|
php-version: ['8.1', '8.2']
|
||||||
swoole: ['yes', 'no']
|
swoole: ['yes', 'no']
|
||||||
steps:
|
steps:
|
||||||
- uses: geekyeggo/delete-artifact@v1
|
- uses: geekyeggo/delete-artifact@v1
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM php:8.1.9-alpine3.16 as base
|
FROM php:8.2.0-alpine3.17 as base
|
||||||
|
|
||||||
ARG SHLINK_VERSION=latest
|
ARG SHLINK_VERSION=latest
|
||||||
ENV SHLINK_VERSION ${SHLINK_VERSION}
|
ENV SHLINK_VERSION ${SHLINK_VERSION}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM php:8.1.9-fpm-alpine3.16
|
FROM php:8.2.0-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
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM php:8.1.9-alpine3.16
|
FROM php:8.2.0-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
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM php:8.1.9-alpine3.16
|
FROM php:8.2.0-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
|
||||||
|
|
Loading…
Reference in a new issue