Skip to content

Commit

Permalink
GH-41 # Switch to rust stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugo-C committed Oct 17, 2023
1 parent 74988df commit 28d53e4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ concurrency: production
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly
stable

0 comments on commit 28d53e4

Please sign in to comment.