diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index d11e562..182c9db 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -30,6 +30,9 @@ concurrency: jobs: build: name: "sqlite" + if: > + github.event_name == 'push' || + contains(github.event.pull_request.labels.*.name, 'e2e') uses: ./.github/workflows/build.yml with: ref: ${{ github.ref }} diff --git a/Dockerfile b/Dockerfile index 6ec6eb0..6116882 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,9 @@ RUN apt update \ git \ make \ pkg-config \ - libtinfo6 \ - cargo + libtinfo6 -RUN cargo install marine --version 0.12.7 +RUN mkdir -p ~/.local/bin && curl -L https://github.com/fluencelabs/marine/releases/download/marine-v0.14.1/marine-linux-x86_64 -o ~/.local/bin/marine && chmod +x ~/.local/bin/marine VOLUME /code WORKDIR /code diff --git a/entrypoint.sh b/entrypoint.sh index ef5fb33..bb5d4fc 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,5 @@ -export PATH="${PATH}:/root/.cargo/bin" +export PATH="${PATH}:/root/.cargo/bin:/root/.local/bin" curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-15/wasi-sdk-15.0-linux.tar.gz | tar xz -C . -mv wasi-sdk-* wasi-sdk +rm -rf wasi-sdk +mv -f wasi-sdk-* wasi-sdk make