Skip to content

Commit 4b7f3a5

Browse files
committed
tweak
1 parent 5d44130 commit 4b7f3a5

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

.github/workflows/ci-cd.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
version: ['7.4', '8.0', '8.1', '8.2', '8.3']
14+
version: ['8.0', '8.1', '8.2', '8.3']
1515

1616
steps:
1717
- name: Checkout code
@@ -22,9 +22,6 @@ jobs:
2222
docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8 ${{ matrix.version }}-nginx-oci8
2323
docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8-prod ${{ matrix.version }}-nginx-oci8-prod
2424
25-
- name: Build Swoole
26-
if: matrix.version != '7.4'
27-
run: |
2825
docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-swoole-oci8 ${{ matrix.version }}-nginx-swoole-oci8
2926
docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod ${{ matrix.version }}-nginx-swoole-oci8-prod
3027
@@ -33,9 +30,6 @@ jobs:
3330
docker run kooldev/php:${{ matrix.version }}-nginx-oci8 php -r "extension_loaded('oci8') or die(1);"
3431
docker run kooldev/php:${{ matrix.version }}-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);"
3532
36-
- name: Tests Swoole
37-
if: matrix.version != '7.4'
38-
run: |
3933
docker run kooldev/php:${{ matrix.version }}-nginx-oci8 php -r "extension_loaded('oci8') or die(1);"
4034
docker run kooldev/php:${{ matrix.version }}-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);"
4135
@@ -55,8 +49,5 @@ jobs:
5549
docker push kooldev/php:${{ matrix.version }}-nginx-oci8
5650
docker push kooldev/php:${{ matrix.version }}-nginx-oci8-prod
5751
58-
- name: Push to DockerHub Swoole
59-
if: github.ref == 'refs/heads/main' && github.repository == 'kool-dev/docker-php-oci8' && matrix.version != '7.4'
60-
run: |
6152
docker push kooldev/php:${{ matrix.version }}-nginx-swoole-oci8
6253
docker push kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod

kool.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ scripts:
33
- kool docker fireworkweb/fwd:v1.0 fwd template
44
build:
55
- kool run template
6-
- docker build --pull -t kooldev/php:7.4-nginx-oci8 7.4-nginx-oci8
7-
- docker build --pull -t kooldev/php:7.4-nginx-oci8-prod 7.4-nginx-oci8-prod
86
- docker build --pull -t kooldev/php:8.0-nginx-oci8 8.0-nginx-oci8
97
- docker build --pull -t kooldev/php:8.0-nginx-oci8-prod 8.0-nginx-oci8-prod
108
- docker build --pull -t kooldev/php:8.0-nginx-swoole-oci8 8.0-nginx-swoole-oci8

0 commit comments

Comments
 (0)