Skip to content

Commit 9665462

Browse files
authored
Merge pull request #564 from davidcole1340/ci/update-docker-deps
2 parents d9d1dcb + fd4a478 commit 9665462

File tree

5 files changed

+51
-50
lines changed

5 files changed

+51
-50
lines changed

.github/actions/embed/Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/actions/embed/action.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/actions/zts/Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/actions/zts/action.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 51 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -168,19 +168,60 @@ jobs:
168168
# Macos fails on unstable rust. We skip the inline examples test for now.
169169
if: "!(contains(matrix.os, 'macos') && matrix.rust == 'nightly')"
170170
run: cargo test --release --workspace --features closure,anyhow,runtime --no-fail-fast ${{ matrix.php == '8.0' && '--no-default-features' || '' }}
171-
build-zts:
172-
name: Build with ZTS
173-
runs-on: ubuntu-latest
174-
steps:
175-
- name: Checkout code
176-
uses: actions/checkout@v5
177-
- name: Build
178-
uses: ./.github/actions/zts
179171
test-embed:
180172
name: Test with embed
181173
runs-on: ubuntu-latest
174+
env:
175+
clang: "17"
176+
php_version: "8.4"
182177
steps:
183178
- name: Checkout code
184179
uses: actions/checkout@v5
185-
- name: Test
186-
uses: ./.github/actions/embed
180+
181+
- name: Setup PHP
182+
uses: shivammathur/setup-php@v2
183+
with:
184+
php-version: ${{ env.php_version }}
185+
env:
186+
debug: true
187+
188+
- name: Install libphp-embed
189+
run: sudo apt update -y && sudo apt install -y libphp8.4-embed
190+
191+
- name: Setup Rust
192+
uses: dtolnay/rust-toolchain@master
193+
with:
194+
toolchain: stable
195+
components: rustfmt, clippy
196+
197+
- name: Install cargo-expand
198+
uses: dtolnay/install@cargo-expand
199+
200+
- name: Cache cargo dependencies
201+
uses: Swatinem/rust-cache@v2
202+
with:
203+
prefix-key: ${{ env.RUST_CACHE_PREFIX }}
204+
205+
- name: Cache LLVM and Clang
206+
id: cache-llvm
207+
uses: actions/cache@v4
208+
with:
209+
path: ${{ runner.temp }}/llvm-${{ env.clang }}
210+
key: ubuntu-latest-llvm-${{ env.clang }}
211+
212+
- name: Setup LLVM & Clang
213+
id: clang
214+
uses: KyleMayes/install-llvm-action@v2
215+
with:
216+
version: ${{ env.clang }}
217+
directory: ${{ runner.temp }}/llvm-${{ env.clang }}
218+
cached: ${{ steps.cache-llvm.outputs.cache-hit }}
219+
220+
- name: Configure Clang
221+
run: |
222+
echo "LIBCLANG_PATH=${{ runner.temp }}/llvm-${{ env.clang }}/lib" >> $GITHUB_ENV
223+
echo "LLVM_VERSION=${{ steps.clang.outputs.version }}" >> $GITHUB_ENV
224+
echo "LLVM_CONFIG_PATH=${{ runner.temp }}/llvm-${{ env.clang }}/bin/llvm-config" >> $GITHUB_ENV
225+
226+
- name: Test with embed feature
227+
run: cargo test --workspace --release --features closure,embed,anyhow --no-fail-fast

0 commit comments

Comments
 (0)