Skip to content

Commit 2b76b16

Browse files
authored
Add Laravel 12.x support (#11)
1 parent 65a8258 commit 2b76b16

File tree

6 files changed

+90
-10
lines changed

6 files changed

+90
-10
lines changed

.docker/php83/Dockerfile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# ----------------------
2+
# The FPM base container
3+
# ----------------------
4+
FROM php:8.3-cli-alpine AS dev
5+
6+
RUN apk add --no-cache --virtual .build-deps \
7+
$PHPIZE_DEPS
8+
9+
# Cleanup apk cache and temp files
10+
RUN rm -rf /var/cache/apk/* /tmp/*
11+
12+
# ----------------------
13+
# Composer install step
14+
# ----------------------
15+
16+
# Get latest Composer
17+
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
18+
19+
# ----------------------
20+
# The FPM production container
21+
# ----------------------
22+
FROM dev

.docker/php84/Dockerfile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# ----------------------
2+
# The FPM base container
3+
# ----------------------
4+
FROM php:8.4-cli-alpine AS dev
5+
6+
RUN apk add --no-cache --virtual .build-deps \
7+
$PHPIZE_DEPS
8+
9+
# Cleanup apk cache and temp files
10+
RUN rm -rf /var/cache/apk/* /tmp/*
11+
12+
# ----------------------
13+
# Composer install step
14+
# ----------------------
15+
16+
# Get latest Composer
17+
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
18+
19+
# ----------------------
20+
# The FPM production container
21+
# ----------------------
22+
FROM dev

.github/workflows/tests.yaml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,41 @@ on:
66

77
jobs:
88
test:
9-
runs-on: ubuntu-latest
9+
runs-on: ${{ matrix.os }}
1010

1111
strategy:
12-
#fail-fast: true
12+
fail-fast: true
1313
matrix:
14-
php: [8.0, 8.1, 8.2, 8.3]
15-
laravel: ['9.*', '10.*', '11.*']
14+
os: [ubuntu-latest]
15+
php: [8.0, 8.1, 8.2, 8.3, 8.4]
16+
laravel: ['9.*', '10.*', '11.*', '12.*']
1617
dependency-version: [prefer-lowest, prefer-stable]
1718
exclude:
1819
- laravel: 9.*
1920
php: 8.2
2021
- laravel: 9.*
2122
php: 8.3
23+
- laravel: 9.*
24+
php: 8.4
2225
- laravel: 10.*
2326
php: 8.0
2427
- laravel: 11.*
2528
php: 8.0
2629
- laravel: 11.*
2730
php: 8.1
31+
- laravel: 12.*
32+
php: 8.0
33+
- laravel: 12.*
34+
php: 8.1
2835
include:
2936
- laravel: 9.*
3037
testbench: 7.*
3138
- laravel: 10.*
3239
testbench: 8.*
3340
- laravel: 11.*
3441
testbench: 9.*
42+
- laravel: 12.*
43+
testbench: 10.*
3544

3645
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
3746

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Changelog
2+
3+
All notable changes to `cybercog/laravel-clickhouse` are documented in [Laravel ClickHouse releases] page.
4+
5+
[Laravel ClickHouse releases]: https://github.com/cybercog/laravel-clickhouse/releases

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
},
3131
"require": {
3232
"php": "^7.4|^8.0",
33-
"illuminate/console": "^8.0|^9.0|^10.1.3|^11.0",
34-
"illuminate/contracts": "^8.0|^9.0|^10.1.3|^11.0",
35-
"illuminate/filesystem": "^8.0|^9.0|^10.1.3|^11.0",
36-
"illuminate/support": "^8.0|^9.0|^10.1.3|^11.0",
33+
"illuminate/console": "^8.0|^9.0|^10.1.3|^11.0|^12.0",
34+
"illuminate/contracts": "^8.0|^9.0|^10.1.3|^11.0|^12.0",
35+
"illuminate/filesystem": "^8.0|^9.0|^10.1.3|^11.0|^12.0",
36+
"illuminate/support": "^8.0|^9.0|^10.1.3|^11.0|^12.0",
3737
"smi2/phpclickhouse": "^1.5.3"
3838
},
3939
"require-dev": {
40-
"orchestra/testbench": "^7.0|^8.0|^9.0",
41-
"phpunit/phpunit": "^9.6|^10.5"
40+
"orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
41+
"phpunit/phpunit": "^9.6|^10.5|^11.5"
4242
},
4343
"autoload": {
4444
"psr-4": {

docker-compose.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,28 @@ services:
2222
volumes:
2323
- ./:/app
2424

25+
php83:
26+
container_name: laravel-clickhouse-lib-83
27+
image: laravel-clickhouse-lib-83
28+
build:
29+
context: ./
30+
dockerfile: ./.docker/php83/Dockerfile
31+
tty: true
32+
working_dir: /app
33+
volumes:
34+
- ./:/app
35+
36+
php84:
37+
container_name: laravel-clickhouse-lib-84
38+
image: laravel-clickhouse-lib-84
39+
build:
40+
context: ./
41+
dockerfile: ./.docker/php84/Dockerfile
42+
tty: true
43+
working_dir: /app
44+
volumes:
45+
- ./:/app
46+
2547
clickhouse:
2648
container_name: laravel-clickhouse-clickhouse
2749
image: yandex/clickhouse-server:21.8-alpine

0 commit comments

Comments
 (0)