From 2987afb20a2e86aacfc1ff2744c4430673c00aea Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sat, 15 Mar 2025 17:13:27 +0000 Subject: [PATCH] use toolchain --- .github/workflows/check.yml | 14 ++++++++++---- .github/workflows/publish-plugin.yml | 2 -- backend/Dockerfile | 2 -- backend/rust-toolchain.toml | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 35e18428..ab601843 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -19,9 +19,6 @@ jobs: - name: Setup run: | - rustup install nightly - rustup default nightly - rustup component add clippy rustfmt cargo install sqlx-cli cd backend sqlx database create --database-url sqlite://db.sqlite3 @@ -44,7 +41,7 @@ jobs: cd backend cargo test --verbose cd sync_lib - # wasm-pack test --node # todo: fix this in CI + wasm-pack test --node - name: Lint frontend run: | @@ -62,3 +59,12 @@ jobs: run: | cd frontend npm run test + + - name: E2E tests + run: | + cd ../backend + UST_BACKTRACE=1 cargo run -p sync_server & + cd - + + npm run build + test-client/run.sh 32 diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml index f1c816ff..c21d986e 100644 --- a/.github/workflows/publish-plugin.yml +++ b/.github/workflows/publish-plugin.yml @@ -23,8 +23,6 @@ jobs: - name: Build wasm run: | cd backend - rustup install nightly - rustup default nightly cargo install wasm-pack wasm-pack build --target web sync_lib diff --git a/backend/Dockerfile b/backend/Dockerfile index 8d2fdc46..c26c125d 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -3,8 +3,6 @@ FROM rust:1.83 AS builder WORKDIR /usr/src/backend RUN apt update && apt install -y musl-tools -RUN rustup install nightly && rustup default nightly -RUN rustup target add x86_64-unknown-linux-musl RUN cargo install sqlx-cli COPY . . diff --git a/backend/rust-toolchain.toml b/backend/rust-toolchain.toml index 46870171..8e466642 100644 --- a/backend/rust-toolchain.toml +++ b/backend/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] channel = "nightly-2025-03-14" -targets = [ "x86_64-unknown-linux-gnu" ] +targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl" ] profile = "default"