Skip to content

Commit 307d320

Browse files
authored
Downgrade MSRV to 1.65 (#145)
1 parent 4216735 commit 307d320

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
matrix:
4343
os:
4444
- ubuntu-20.04
45-
- macos-11
45+
- macos-12
4646
php-version:
4747
- "7.0"
4848
- "7.1"
@@ -59,10 +59,16 @@ jobs:
5959
- name: Checkout
6060
uses: actions/checkout@v2
6161

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

66+
- name: Setup libclang for Macos
67+
if: matrix.os == 'macos-12'
68+
run: |
69+
brew install llvm@13
70+
echo "LIBCLANG_PATH=$(brew --prefix llvm@13)/lib" >> $GITHUB_ENV
71+
6672
- name: Setup PHP
6773
uses: shivammathur/setup-php@v2
6874
with:
@@ -77,7 +83,7 @@ jobs:
7783
sudo ln -s /usr/sbin/php-fpm${{ matrix.php-version }} /usr/sbin/php-fpm
7884
7985
- name: Setup php-fpm for Macos
80-
if: matrix.os == 'macos-11'
86+
if: matrix.os == 'macos-12'
8187
run: |
8288
brew install php@${{ matrix.php-version }}
8389
@@ -98,9 +104,7 @@ jobs:
98104
components: rustfmt
99105

100106
- name: Cargo generate lockfile
101-
uses: actions-rs/cargo@v1
102-
with:
103-
command: generate-lockfile
107+
run: cargo +nightly -Z minimal-versions update
104108

105109
- name: Setup cargo cache
106110
uses: actions/cache@v3

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ authors = ["PHPER Framework Team", "jmjoy <[email protected]>"]
3030
edition = "2021"
3131
license = "MulanPSL-2.0"
3232
repository = "https://github.com/phper-framework/phper"
33-
rust-version = "1.67"
33+
rust-version = "1.65"
3434

3535
[workspace.dependencies]
3636
phper = { version = "0.13.0", path = "./phper" }

phper-sys/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ repository = { workspace = true }
2020
license = { workspace = true }
2121

2222
[build-dependencies]
23-
bindgen = "0.66.1"
23+
bindgen = "0.69.1"
2424
cc = "1.0.79"
25+
regex = "1.5.6"

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
# See the Mulan PSL v2 for more details.
1010

1111
[toolchain]
12-
channel = "1.67"
12+
channel = "1.65"
1313
components = ["clippy", "rustfmt"]

0 commit comments

Comments
 (0)