Skip to content

Commit

Permalink
Keep home version and stage Cargo.lock (#167)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmjoy authored Jan 7, 2025
1 parent 34bdf95 commit ad19a98
Show file tree
Hide file tree
Showing 4 changed files with 2,152 additions and 9 deletions.
13 changes: 5 additions & 8 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-12
- macos-14
php-version:
- "7.0"
- "7.1"
Expand All @@ -65,10 +65,10 @@ jobs:
run: sudo apt-get install -y llvm-10-dev libclang-10-dev

- name: Setup libclang for Macos
if: matrix.os == 'macos-12'
if: matrix.os == 'macos-14'
run: |
brew install llvm@13
echo "LIBCLANG_PATH=$(brew --prefix llvm@13)/lib" >> $GITHUB_ENV
brew install llvm@18
echo "LIBCLANG_PATH=$(brew --prefix llvm@18)/lib" >> $GITHUB_ENV
- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -84,7 +84,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-12'
if: matrix.os == 'macos-14'
run: |
brew install php@${{ matrix.php-version }}
Expand All @@ -104,9 +104,6 @@ jobs:
toolchain: nightly
components: rustfmt

- name: Cargo generate lockfile
run: cargo +nightly -Z minimal-versions update

- name: Setup cargo cache
uses: actions/cache@v3
with:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/target
**/*.rs.bk
Cargo.lock
/.cargo
/vendor
core
Loading

0 comments on commit ad19a98

Please sign in to comment.