Skip to content

Commit feef053

Browse files
committed
Upgrade swoole and swow versions
1 parent ef61834 commit feef053

7 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/workflows/build-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build Develop
22

33
on: [ push ]
44
env:
5-
COMPOSER_VERSION: '2.9.4'
5+
COMPOSER_VERSION: '2.9.8'
66
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77
jobs:
88
build:

.github/workflows/build-swoole.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: Build Swoole
33
on: [ push ]
44
env:
55
ENGINE: 'swoole'
6-
SW_VERSION: 'v6.1.7'
7-
COMPOSER_VERSION: '2.9.4'
6+
SW_VERSION: 'v6.2.1'
7+
COMPOSER_VERSION: '2.9.8'
88
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
99
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}
1010
CODING_PASSWORD: ${{ secrets.CODING_PASSWORD }}

.github/workflows/build-swow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: Build Swow
33
on: [ push ]
44
env:
55
ENGINE: 'swow'
6-
SW_VERSION: 'v1.5.3'
7-
COMPOSER_VERSION: '2.9.4'
6+
SW_VERSION: 'v1.6.2'
7+
COMPOSER_VERSION: '2.9.8'
88
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
99
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}
1010
CODING_PASSWORD: ${{ secrets.CODING_PASSWORD }}

.github/workflows/readme.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## How to build local
22

33
```shell
4-
export PHP_VERSION=8.1 && export ALPINE_VERSION=3.18 && export SW_VERSION=5.0.3 && export COMPOSER_VERSION=2.6.4 && export PHP_BUILD_VERSION=81 && docker-compose build alpine-swoole
4+
export PHP_VERSION=8.4 && export ALPINE_VERSION=edge && export SW_VERSION=v6.2.1 && export COMPOSER_VERSION=2.9.8 && export PHP_BUILD_VERSION=84 && docker-compose build alpine-swoole
5+
56
export PHP_VERSION=8.1 && export ALPINE_VERSION=3.18 && docker-compose build alpine-base
67
```

8.4/alpine/dev/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN set -ex \
3333
# install composer
3434
&& wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
3535
&& chmod u+x /usr/local/bin/composer \
36+
&& [ ! -f /usr/bin/php ] && cp /usr/bin/php${PHP_BUILD_VERSION} /usr/bin/php \
3637
# php info
3738
&& php -v \
3839
&& php -m \

8.4/alpine/swoole/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ RUN set -ex \
5454
# install composer
5555
&& wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
5656
&& chmod u+x /usr/local/bin/composer \
57+
&& [ ! -f /usr/bin/php ] && cp /usr/bin/php${PHP_BUILD_VERSION} /usr/bin/php \
5758
# ---------- clear works ----------
5859
&& apk del .build-deps \
5960
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/local/bin/php* \

8.4/alpine/swoole/Dockerfile-slim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ RUN set -ex \
5454
# install composer
5555
&& wget -nv -O /usr/local/bin/composer https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
5656
&& chmod u+x /usr/local/bin/composer \
57+
&& [ ! -f /usr/bin/php ] && cp /usr/bin/php${PHP_BUILD_VERSION} /usr/bin/php \
5758
# ---------- clear works ----------
5859
&& apk del .build-deps \
5960
&& rm -rf /var/cache/apk/* /tmp/* /usr/share/man /usr/local/bin/php* \

0 commit comments

Comments
 (0)