diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index af18ec2..9533c54 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -5,6 +5,8 @@ concurrency: production on: push: branches: [ master ] + pull_request: + branches: [ master ] jobs: test: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0b4c4b8..013edcb 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -22,7 +22,7 @@ jobs: run: cargo test --verbose - uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: stable components: clippy override: true - uses: actions-rs/clippy-check@v1 diff --git a/Dockerfile b/Dockerfile index 6105f5b..410316a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG BUILD_TARGET="x86_64-unknown-linux-musl" ARG BUILD_OPTIONS="--release --target $BUILD_TARGET" RUN apt update && apt install -y build-essential musl-tools -RUN rustup set profile minimal && rustup default nightly && rustup target add $BUILD_TARGET +RUN rustup set profile minimal && rustup target add $BUILD_TARGET WORKDIR /app @@ -24,11 +24,11 @@ RUN cargo build $BUILD_OPTIONS COPY . /app/project/ # This is the actual build, touch the main.rs to have newer timestamp -RUN touch /app/project/src/main.rs && cargo build $BUILD_OPTIONS -Z unstable-options --out-dir /app/dist +RUN touch /app/project/src/main.rs && cargo build $BUILD_OPTIONS FROM alpine:3 as production-stage RUN mkdir /app -COPY --from=build-stage /app/dist/jarm_online /app +COPY --from=build-stage /app/project/target/release/jarm_online /app COPY --from=build-stage /app/project/Rocket.toml / RUN chown -R 1001:1001 /app USER 1001 diff --git a/rust-toolchain b/rust-toolchain index 07ade69..870bbe4 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly \ No newline at end of file +stable \ No newline at end of file