Skip to content

Commit 2a6e39b

Browse files
authored
Start 1.0.0 development and Update CI (#126)
1 parent 062f8b1 commit 2a6e39b

File tree

6 files changed

+25
-32
lines changed

6 files changed

+25
-32
lines changed

.github/workflows/container.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
container:
2525
name: container
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
steps:
2828
- name: Checkout
2929
uses: actions/checkout@v2

.github/workflows/license.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
jobs:
2727
license:
2828
name: license
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-24.04
3030
steps:
3131
- name: Checkout
3232
uses: actions/checkout@v2

.github/workflows/pecl.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ env:
2727
CARGO_TERM_COLOR: always
2828
RUST_BACKTRACE: "1"
2929
RUSTFLAGS: "-D warnings"
30-
LLVM_CONFIG_PATH: llvm-config-10
30+
LLVM_CONFIG_PATH: llvm-config-18
3131
RUSTUP_HOME: /tmp/rustup
3232
CARGO_HOME: /tmp/cargo
3333

3434
jobs:
3535
pecl-required:
3636
needs:
3737
- pecl
38-
runs-on: ubuntu-20.04
38+
runs-on: ubuntu-24.04
3939
steps:
4040
- name: Check results
4141
run: |
@@ -47,8 +47,8 @@ jobs:
4747
fail-fast: false
4848
matrix:
4949
os:
50-
- ubuntu-20.04
51-
# - macos-12
50+
- ubuntu-24.04
51+
- macos-14
5252
version:
5353
- php: "8.2"
5454
swoole: "5.1.1"
@@ -63,18 +63,14 @@ jobs:
6363
with:
6464
submodules: 'recursive'
6565

66-
- name: Install libclang
67-
if: matrix.os == 'ubuntu-20.04'
68-
run: sudo apt-get install -y llvm-10-dev libclang-10-dev protobuf-compiler
66+
- name: Install dependencies for Linux
67+
if: matrix.os == 'ubuntu-24.04'
68+
run: sudo apt-get update && sudo apt-get install -y llvm-18-dev libclang-18-dev protobuf-compiler libsasl2-dev
6969

7070
- name: Install protobuf for Macos
71-
if: matrix.os == 'macos-12'
71+
if: matrix.os == 'macos-14'
7272
run: brew install protobuf
7373

74-
- name: Install libsasl2
75-
if: matrix.os == 'ubuntu-20.04'
76-
run: sudo apt-get install -y libsasl2-dev
77-
7874
- name: Setup PHP
7975
uses: shivammathur/setup-php@v2
8076
with:

.github/workflows/rust.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ env:
2828
CARGO_TERM_COLOR: always
2929
RUST_BACKTRACE: "1"
3030
RUSTFLAGS: "-D warnings"
31-
LLVM_CONFIG_PATH: llvm-config-10
31+
LLVM_CONFIG_PATH: llvm-config-18
3232
RUST_STABLE_TOOLCHAIN: "1.65"
3333
RUST_NIGHTLY_TOOLCHAIN: "nightly-2023-07-12"
3434

@@ -37,7 +37,7 @@ jobs:
3737
needs:
3838
- test
3939
- fmt
40-
runs-on: ubuntu-20.04
40+
runs-on: ubuntu-24.04
4141
steps:
4242
- name: Check results
4343
run: |
@@ -50,9 +50,9 @@ jobs:
5050
fail-fast: false
5151
matrix:
5252
os:
53-
- ubuntu-20.04
53+
- ubuntu-24.04
5454
# TODO Temporarily remove macos and wait for the docker container's connection refused problem to be resolved.
55-
# - macos-12
55+
# - macos-14
5656
flag:
5757
# Many composer dependencies need PHP 7.2+
5858
- php_version: "7.2"
@@ -103,18 +103,14 @@ jobs:
103103
with:
104104
submodules: "recursive"
105105

106-
- name: Install libclang and protobuf for Linux
107-
if: matrix.os == 'ubuntu-20.04'
108-
run: sudo apt-get install -y llvm-10-dev libclang-10-dev protobuf-compiler
106+
- name: Install dependencies for Linux
107+
if: matrix.os == 'ubuntu-24.04'
108+
run: sudo apt-get update && sudo apt-get install -y llvm-18-dev libclang-18-dev protobuf-compiler libsasl2-dev
109109

110110
- name: Install protobuf for Macos
111-
if: matrix.os == 'macos-12'
111+
if: matrix.os == 'macos-14'
112112
run: brew install protobuf
113113

114-
- name: Install libsasl2
115-
if: matrix.os == 'ubuntu-20.04'
116-
run: sudo apt-get install -y libsasl2-dev
117-
118114
- name: Setup PHP
119115
uses: shivammathur/setup-php@v2
120116
with:
@@ -127,7 +123,7 @@ jobs:
127123
yaml, zip, mongodb, memcache
128124
129125
- name: Setup php-fpm for Linux
130-
if: matrix.os == 'ubuntu-20.04'
126+
if: matrix.os == 'ubuntu-24.04'
131127
run: |
132128
sudo apt-get install -y php${{ matrix.flag.php_version }}-fpm
133129
sudo ln -sf /usr/sbin/php-fpm${{ matrix.flag.php_version }} /usr/sbin/php-fpm
@@ -180,13 +176,14 @@ jobs:
180176
run: composer install --working-dir=tests/php
181177

182178
- name: Setup docker (missing on MacOS)
183-
if: matrix.os == 'macos-12'
179+
if: matrix.os == 'macos-14'
184180
run: |
185181
brew install docker
186182
brew install docker-compose
187183
mkdir -p ~/.docker/cli-plugins
188184
ln -sfn $(brew --prefix)/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
189185
186+
brew install colima
190187
colima start
191188
192189
# For test containers to find the Colima socket
@@ -248,7 +245,7 @@ jobs:
248245
fail-fast: false
249246
matrix:
250247
os:
251-
- ubuntu-20.04
248+
- ubuntu-24.04
252249

253250
runs-on: ${{ matrix.os }}
254251
steps:

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ members = [
2121
]
2222

2323
[workspace.package]
24-
version = "0.8.0"
24+
version = "1.0.0-dev"
2525
authors = ["Apache Software Foundation", "jmjoy <jmjoy@apache.org>", "Yanlong He <heyanlong@apache.org>"]
2626
edition = "2021"
2727
rust-version = "1.65"

0 commit comments

Comments
 (0)