Skip to content

Spec #10

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.

Sign up for GitHub

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

Draft
bbutkovic wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Spec #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee137d3
add integration tests
bbutkovic Mar 17, 2023
3cac962
Merge branch 'main' into spec
bbutkovic Jun 28, 2023
0415abb
run tests in CI
bbutkovic Jun 29, 2023
d3d4c08
always upload runtime so that tests can use them
bbutkovic Jun 29, 2023
3ea8330
order only dependency for tests
bbutkovic Jun 29, 2023
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
17 changes: 16 additions & 1 deletion .github/workflows/runtime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
run: make all use_sccache=true WASI_SDK_PATH=$WASI_SDK_PATH numjobs=3

- name: Upload runtime
if: startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v3
with:
name: runtime
Expand All @@ -49,6 +48,22 @@ jobs:
shell: bash
run: ${SCCACHE_PATH} --show-stats

test:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Get runtime
uses: actions/download-artifact@v3
with:
name: runtime

- name: Run tests
run: make test

release:
if: startsWith(github.ref, 'refs/tags/')
needs: build
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
*.wat
*.phar
debugger*
/integration-tests/fixtures/*/bundle.wasm
/integration-tests/target
/integration-test-runner
/stub-gen
/stub-generator/target
/*.stubs.php
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ members = [
]

exclude = [
"integration-tests",
"stub-generator",
]

Expand Down
31 changes: 22 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,28 @@ deps/php/libs/libphp.a: export NM := ${NM}
deps/php/libs/libphp.a: deps/php/Makefile
cd deps/php && make ${numjobs_flag} libphp.la

.PHONY: clean cargo-clean
clean:
@rm -rf runtime.wasm deps/
.PHONY: test
test: | runtime.wasm integration-test

.PHONY: integration-test
integration-test: integration-test-runner
./integration-test-runner $(PWD)/integration-tests/fixtures $(PWD)/runtime.wasm

integration-test-runner:
cargo build --target=$(HOST_TARGET_TRIPLE) --release --manifest-path=integration-tests/Cargo.toml && \
cp integration-tests/target/$(HOST_TARGET_TRIPLE)/release/integration-tests integration-test-runner

.PHONY: clean
clean: cargo-clean tests-clean
@rm -rf runtime.wasm runtime.wat deps/

.PHONY: tests-clean
tests-clean:
@rm -rf integration-test-runner integration-tests/target

.PHONY: cargo-clean
cargo-clean:
cargo clean

fastly-php-runtime.stubs.php: runtime.wasm stub-gen
./stub-gen runtime.wasm > fastly-php-runtime.stubs.php
Expand All @@ -185,9 +204,3 @@ stub-gen:

.PHONY: all
all: runtime.wasm fastly-php-runtime.stubs.php

.PHONY: test
test: runtime.wasm integration-test

cargo-clean: clean
cargo clean
Loading