Skip to content

Commit ad19a98

Browse files
authored
Keep home version and stage Cargo.lock (#167)
1 parent 34bdf95 commit ad19a98

File tree

4 files changed

+2152
-9
lines changed

4 files changed

+2152
-9
lines changed

.github/workflows/ci.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
matrix:
4343
os:
4444
- ubuntu-20.04
45-
- macos-12
45+
- macos-14
4646
php-version:
4747
- "7.0"
4848
- "7.1"
@@ -65,10 +65,10 @@ jobs:
6565
run: sudo apt-get install -y llvm-10-dev libclang-10-dev
6666

6767
- name: Setup libclang for Macos
68-
if: matrix.os == 'macos-12'
68+
if: matrix.os == 'macos-14'
6969
run: |
70-
brew install llvm@13
71-
echo "LIBCLANG_PATH=$(brew --prefix llvm@13)/lib" >> $GITHUB_ENV
70+
brew install llvm@18
71+
echo "LIBCLANG_PATH=$(brew --prefix llvm@18)/lib" >> $GITHUB_ENV
7272
7373
- name: Setup PHP
7474
uses: shivammathur/setup-php@v2
@@ -84,7 +84,7 @@ jobs:
8484
sudo ln -s /usr/sbin/php-fpm${{ matrix.php-version }} /usr/sbin/php-fpm
8585
8686
- name: Setup php-fpm for Macos
87-
if: matrix.os == 'macos-12'
87+
if: matrix.os == 'macos-14'
8888
run: |
8989
brew install php@${{ matrix.php-version }}
9090
@@ -104,9 +104,6 @@ jobs:
104104
toolchain: nightly
105105
components: rustfmt
106106

107-
- name: Cargo generate lockfile
108-
run: cargo +nightly -Z minimal-versions update
109-
110107
- name: Setup cargo cache
111108
uses: actions/cache@v3
112109
with:

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/target
22
**/*.rs.bk
3-
Cargo.lock
43
/.cargo
54
/vendor
65
core

0 commit comments

Comments
 (0)