Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep home version and stage Cargo.lock #167

Merged
merged 4 commits into from
Jan 7, 2025
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
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
Loading