diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 14a71c1..c9a9de8 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -94,6 +94,9 @@ jobs: - name: Compile SLEdge run: | make runtime + - name: Install wasm_apps link + run: | + make wasm_apps # TODO:Cache assets before being copied to ./runtime/bin - name: Cache gocr uses: actions/cache@v2 diff --git a/.gitignore b/.gitignore index 9c078b4..361ba0e 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,7 @@ dkms.conf runtime/tags runtime/bin +applications/wasm_apps applications/tmp/ applications/**/*.csv applications/**/*.txt diff --git a/.gitmodules b/.gitmodules index bfb6e77..6bf13eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,7 +12,3 @@ [submodule "jsmn"] path = runtime/thirdparty/jsmn url = https://github.com/gwsystems/jsmn.git -[submodule "wasm_apps"] - path = applications/wasm_apps - url = https://github.com/gwsystems/wasm_apps.git - branch = master diff --git a/Makefile b/Makefile index 47c5e8c..929f95a 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ submodules: git submodule update --init --recursive .PHONY: install -install: submodules all +install: submodules wasm_apps all # aWsm: the WebAssembly to LLVM bitcode compiler .PHONY: awsm @@ -50,6 +50,10 @@ applications: applications.clean: make -C applications clean +# Instead of having two copies of wasm_apps, just link to the awsm repo's copy +wasm_apps: + ln -sr awsm/applications/wasm_apps/ applications/ + # Tests .PHONY: test test: diff --git a/applications/wasm_apps b/applications/wasm_apps deleted file mode 160000 index 3f5bc00..0000000 --- a/applications/wasm_apps +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3f5bc009f71c9561bfb4f3b08b47aa53983ef0f9