Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
jobs:
container:
name: container
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
jobs:
license:
name: license
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
20 changes: 8 additions & 12 deletions .github/workflows/pecl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ env:
CARGO_TERM_COLOR: always
RUST_BACKTRACE: "1"
RUSTFLAGS: "-D warnings"
LLVM_CONFIG_PATH: llvm-config-10
LLVM_CONFIG_PATH: llvm-config-18
RUSTUP_HOME: /tmp/rustup
CARGO_HOME: /tmp/cargo

jobs:
pecl-required:
needs:
- pecl
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Check results
run: |
Expand All @@ -47,8 +47,8 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-20.04
# - macos-12
- ubuntu-24.04
- macos-14
version:
- php: "8.2"
swoole: "5.1.1"
Expand All @@ -63,18 +63,14 @@ jobs:
with:
submodules: 'recursive'

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

- name: Install protobuf for Macos
if: matrix.os == 'macos-12'
if: matrix.os == 'macos-14'
run: brew install protobuf

- name: Install libsasl2
if: matrix.os == 'ubuntu-20.04'
run: sudo apt-get install -y libsasl2-dev

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
Expand Down
27 changes: 12 additions & 15 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
CARGO_TERM_COLOR: always
RUST_BACKTRACE: "1"
RUSTFLAGS: "-D warnings"
LLVM_CONFIG_PATH: llvm-config-10
LLVM_CONFIG_PATH: llvm-config-18
RUST_STABLE_TOOLCHAIN: "1.65"
RUST_NIGHTLY_TOOLCHAIN: "nightly-2023-07-12"

Expand All @@ -37,7 +37,7 @@ jobs:
needs:
- test
- fmt
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Check results
run: |
Expand All @@ -50,9 +50,9 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-20.04
- ubuntu-24.04
# TODO Temporarily remove macos and wait for the docker container's connection refused problem to be resolved.
# - macos-12
# - macos-14
flag:
# Many composer dependencies need PHP 7.2+
- php_version: "7.2"
Expand Down Expand Up @@ -103,18 +103,14 @@ jobs:
with:
submodules: "recursive"

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

- name: Install protobuf for Macos
if: matrix.os == 'macos-12'
if: matrix.os == 'macos-14'
run: brew install protobuf

- name: Install libsasl2
if: matrix.os == 'ubuntu-20.04'
run: sudo apt-get install -y libsasl2-dev

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
Expand All @@ -127,7 +123,7 @@ jobs:
yaml, zip, mongodb, memcache

- name: Setup php-fpm for Linux
if: matrix.os == 'ubuntu-20.04'
if: matrix.os == 'ubuntu-24.04'
run: |
sudo apt-get install -y php${{ matrix.flag.php_version }}-fpm
sudo ln -sf /usr/sbin/php-fpm${{ matrix.flag.php_version }} /usr/sbin/php-fpm
Expand Down Expand Up @@ -180,13 +176,14 @@ jobs:
run: composer install --working-dir=tests/php

- name: Setup docker (missing on MacOS)
if: matrix.os == 'macos-12'
if: matrix.os == 'macos-14'
run: |
brew install docker
brew install docker-compose
mkdir -p ~/.docker/cli-plugins
ln -sfn $(brew --prefix)/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose

brew install colima
colima start

# For test containers to find the Colima socket
Expand Down Expand Up @@ -248,7 +245,7 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-20.04
- ubuntu-24.04

runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ members = [
]

[workspace.package]
version = "0.8.0"
version = "1.0.0-dev"
authors = ["Apache Software Foundation", "jmjoy <jmjoy@apache.org>", "Yanlong He <heyanlong@apache.org>"]
edition = "2021"
rust-version = "1.65"
Expand Down
Loading