Skip to content

Commit

Permalink
Downgrade MSRV to 1.65 (#145)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmjoy authored Jan 10, 2024
1 parent 4216735 commit 307d320
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
matrix:
os:
- ubuntu-20.04
- macos-11
- macos-12
php-version:
- "7.0"
- "7.1"
Expand All @@ -59,10 +59,16 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Install libclang
- name: Install libclang for Linux
if: matrix.os == 'ubuntu-20.04'
run: sudo apt-get install -y llvm-10-dev libclang-10-dev

- name: Setup libclang for Macos
if: matrix.os == 'macos-12'
run: |
brew install llvm@13
echo "LIBCLANG_PATH=$(brew --prefix llvm@13)/lib" >> $GITHUB_ENV
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
Expand All @@ -77,7 +83,7 @@ jobs:
sudo ln -s /usr/sbin/php-fpm${{ matrix.php-version }} /usr/sbin/php-fpm
- name: Setup php-fpm for Macos
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-12'
run: |
brew install php@${{ matrix.php-version }}
Expand All @@ -98,9 +104,7 @@ jobs:
components: rustfmt

- name: Cargo generate lockfile
uses: actions-rs/cargo@v1
with:
command: generate-lockfile
run: cargo +nightly -Z minimal-versions update

- name: Setup cargo cache
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ authors = ["PHPER Framework Team", "jmjoy <jmjoy@apache.org>"]
edition = "2021"
license = "MulanPSL-2.0"
repository = "https://github.com/phper-framework/phper"
rust-version = "1.67"
rust-version = "1.65"

[workspace.dependencies]
phper = { version = "0.13.0", path = "./phper" }
Expand Down
3 changes: 2 additions & 1 deletion phper-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ repository = { workspace = true }
license = { workspace = true }

[build-dependencies]
bindgen = "0.66.1"
bindgen = "0.69.1"
cc = "1.0.79"
regex = "1.5.6"
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# See the Mulan PSL v2 for more details.

[toolchain]
channel = "1.67"
channel = "1.65"
components = ["clippy", "rustfmt"]

0 comments on commit 307d320

Please sign in to comment.