Merge branch 'main' into lock-free-gauge-set

LKaemmerling · web-flow · commit b2a0cec1e2a5 · 2023-11-24T05:54:19.000+01:00
diff --git a/.github/workflows/blackbox.yml b/.github/workflows/blackbox.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           coverage: none
 
       - name: Install dependencies
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           coverage: none
 
       - name: Install dependencies
@@ -34,10 +34,10 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - "7.4"
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
     name: PHPStan on PHP ${{ matrix.php }}
     steps:
       - name: Checkout code
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest ]
-        php: [ 7.4, 8.0, 8.1, 8.2 ]
+        php: [ 8.0, 8.1, 8.2, 8.3 ]
         dependency-version: [ prefer-lowest, prefer-stable ]
         redis-version: [ 5, 6, 7 ]
 
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-fpm
+FROM php:8.2-fpm
 
 RUN pecl install redis && docker-php-ext-enable redis
 RUN pecl install apcu && docker-php-ext-enable apcu

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.1-fpm`
	`1`	`+FROM php:8.2-fpm`
`2`	`2`
`3`	`3`	`RUN pecl install redis && docker-php-ext-enable redis`
`4`	`4`	`RUN pecl install apcu && docker-php-ext-enable apcu`