diff --git a/.github/workflows/ValidatePullRequest.yml b/.github/workflows/ValidatePullRequest.yml index 320bcef..fee8622 100644 --- a/.github/workflows/ValidatePullRequest.yml +++ b/.github/workflows/ValidatePullRequest.yml @@ -15,7 +15,7 @@ concurrency: permissions: pull-requests: read contents: read - packages: read + packages: write jobs: @@ -87,4 +87,4 @@ jobs: run: exit 0 - name: Previous jobs failed if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }} - run: exit 1 \ No newline at end of file + run: exit 1 diff --git a/.github/workflows/dep_build_wasm_examples.yml b/.github/workflows/dep_build_wasm_examples.yml index 1301366..9c02f1d 100644 --- a/.github/workflows/dep_build_wasm_examples.yml +++ b/.github/workflows/dep_build_wasm_examples.yml @@ -4,13 +4,20 @@ name: Build Wasm Examples on: + workflow_dispatch: + inputs: + docs_only: + description: Skip building if docs only + required: false + type: string + default: "false" workflow_call: inputs: - docs_only: - description: Skip building if docs only - required: false - type: string - default: "false" + docs_only: + description: Skip building if docs only + required: false + type: string + default: "false" permissions: packages: write diff --git a/src/hyperlight_wasm/scripts/build-wasm-examples.sh b/src/hyperlight_wasm/scripts/build-wasm-examples.sh index 9deee9d..50ef684 100755 --- a/src/hyperlight_wasm/scripts/build-wasm-examples.sh +++ b/src/hyperlight_wasm/scripts/build-wasm-examples.sh @@ -29,9 +29,9 @@ else echo This will take a while if it is the first time you are building the docker image. echo Log in ${OUTPUT_DIR}/dockerbuild.log - docker pull ghcr.io/deislabs/wasm-clang-builder:latest + docker pull ghcr.io/hyperlight-dev/wasm-clang-builder:latest - docker build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=20.0 --cache-from ghcr.io/deislabs/wasm-clang-builder:latest -t wasm-clang-builder:latest . 2> ${OUTPUT_DIR}/dockerbuild.log + docker build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=20.0 --cache-from ghcr.io/hyperlight-dev/wasm-clang-builder:latest -t wasm-clang-builder:latest . 2> ${OUTPUT_DIR}/dockerbuild.log for FILENAME in $(find . -name '*.c') do diff --git a/src/wasmsamples/compile-wasm.bat b/src/wasmsamples/compile-wasm.bat index 37b8f12..bd4b279 100644 --- a/src/wasmsamples/compile-wasm.bat +++ b/src/wasmsamples/compile-wasm.bat @@ -14,11 +14,11 @@ where docker || ( set "dockeroutput=$(wslpath '%~2')" ) -%dockercmd% pull ghcr.io/deislabs/wasm-clang-builder:latest +%dockercmd% pull ghcr.io/hyperlight-dev/wasm-clang-builder:latest echo Building docker image that has Wasm sdk. Should be quick if no changes to docker image. echo Log in %2\dockerbuild.log -%dockercmd% build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=20.0 --cache-from ghcr.io/deislabs/wasm-clang-builder:latest -t wasm-clang-builder:latest !dockerinput! 2> %2dockerbuild.log +%dockercmd% build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=20.0 --cache-from ghcr.io/hyperlight-dev/wasm-clang-builder:latest -t wasm-clang-builder:latest !dockerinput! 2> %2dockerbuild.log echo Building Wasm files in %1 and output to %2 for /R "%1" %%i in (*.c) do ( diff --git a/src/wasmsamples/dockerfile b/src/wasmsamples/dockerfile index 30bef67..a4462cb 100644 --- a/src/wasmsamples/dockerfile +++ b/src/wasmsamples/dockerfile @@ -1,6 +1,6 @@ FROM ubuntu ENV DEBIAN_FRONTEND=noninteractive -LABEL org.opencontainers.image.source=https://github.com/deislabs/hyperlight-wasm +LABEL org.opencontainers.image.source=https://github.com/hyperlight-dev/hyperlight-wasm ARG GCC_VERSION=12 @@ -19,4 +19,4 @@ RUN wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WA && tar xvf wasi-sdk-${WASI_SDK_VERSION_FULL}-linux.tar.gz \ && rm wasi-sdk-${WASI_SDK_VERSION_FULL}-linux.tar.gz \ && mv /wasi-sdk-${WASI_SDK_VERSION_FULL} /opt/wasi-sdk -CMD ["/bin/sh"] \ No newline at end of file +CMD ["/bin/sh"]