diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index 9e46b6908..4bdae960d 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -10,6 +10,12 @@ jobs: - uses: actions/setup-node@v4 with: node-version: "20.9.0" + - uses: dtolnay/rust-toolchain@stable + - uses: Swatinem/rust-cache@v2 + with: + workspaces: radicle-httpd -> target + - name: Build + run: cargo build --all --release --manifest-path=./radicle-httpd/Cargo.toml - name: Install dependencies run: npm ci - name: Install Playwright Browsers diff --git a/.github/workflows/check-e2e.yml b/.github/workflows/check-e2e.yml index dbddf7d9a..7b22a2672 100644 --- a/.github/workflows/check-e2e.yml +++ b/.github/workflows/check-e2e.yml @@ -11,6 +11,12 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - uses: Swatinem/rust-cache@v2 + with: + workspaces: radicle-httpd -> target + - name: Build + run: cargo build --all --release --manifest-path=./radicle-httpd/Cargo.toml - uses: actions/setup-node@v4 with: node-version: "20.9.0" diff --git a/.github/workflows/check-visual.yml b/.github/workflows/check-visual.yml index a07968ae7..2691dbbbf 100644 --- a/.github/workflows/check-visual.yml +++ b/.github/workflows/check-visual.yml @@ -26,6 +26,12 @@ jobs: - uses: actions/setup-node@v4 with: node-version: "20.9.0" + - uses: dtolnay/rust-toolchain@stable + - uses: Swatinem/rust-cache@v2 + with: + workspaces: radicle-httpd -> target + - name: Build + run: cargo build --all --release --manifest-path=./radicle-httpd/Cargo.toml - name: Install dependencies run: npm ci diff --git a/scripts/install-binaries b/scripts/install-binaries index d8f33f4e6..723c22858 100755 --- a/scripts/install-binaries +++ b/scripts/install-binaries @@ -33,22 +33,28 @@ while [ $# -ne 0 ]; do done if test -d "$BINARY_PATH"; then - echo ✅ "Folder $BINARY_PATH exists already skipping download." + echo ✅ "Folder $BINARY_PATH exists already skipping download and build." else mkdir -p "$BINARY_PATH" case "$OS" in Darwin) - echo Downloading "$RELEASE" from "https://files.radicle.xyz/releases/$RELEASE/radicle-aarch64-apple-darwin.tar.xz" + echo Downloading "$RELEASE" from "https://files.radicle.xyz/releases/$RELEASE/radicle-aarch64-apple-darwin.tar.xz into /tests/tmp/bin/$RELEASE" curl --fail -s "https://files.radicle.xyz/releases/$RELEASE/radicle-aarch64-apple-darwin.tar.xz" | tar -xJ --strip-components=2 -C "$BINARY_PATH" "radicle-$RELEASE-aarch64-apple-darwin/bin/" || (echo "Download failed" && exit 1) ;; Linux) - echo Downloading "$RELEASE" from "https://files.radicle.xyz/releases/$RELEASE/radicle-x86_64-unknown-linux-musl.tar.xz" + echo Downloading "$RELEASE" from "https://files.radicle.xyz/releases/$RELEASE/radicle-x86_64-unknown-linux-musl.tar.xz into /tests/tmp/bin/$RELEASE" curl --fail -s "https://files.radicle.xyz/releases/$RELEASE/radicle-x86_64-unknown-linux-musl.tar.xz" | tar -xJ --strip-components=2 -C "$BINARY_PATH" "radicle-$RELEASE-x86_64-unknown-linux-musl/bin/" || (echo "Download failed" && exit 1) ;; *) echo "There are no precompiled binaries for your OS: $OS, compile $RELEASE manually and make sure it's in PATH." && exit 1 ;; esac + + echo Building radicle-httpd and rad-web + CARGO_TERM_PROGRESS_WIDTH=80 CARGO_TERM_PROGRESS_WHEN=always cargo build --release --all --quiet --manifest-path=$REPO_ROOT/radicle-httpd/Cargo.toml + echo Copying radicle-httpd and rad-web into /tests/tmp/bin/$RELEASE + cp $REPO_ROOT/radicle-httpd/target/release/radicle-httpd $BINARY_PATH + cp $REPO_ROOT/radicle-httpd/target/release/rad-web $BINARY_PATH fi echo diff --git a/tests/e2e/node.spec.ts b/tests/e2e/node.spec.ts index 19d99501f..930c83c00 100644 --- a/tests/e2e/node.spec.ts +++ b/tests/e2e/node.spec.ts @@ -18,7 +18,7 @@ test("node metadata", async ({ page, peerManager }) => { await expect( page.getByText(`${shortNodeRemote}@seed.radicle.test:8123`), ).toBeVisible(); - await expect(page.getByText("1.0.0-rc.11-")).toBeVisible(); + await expect(page.getByText("pre-release")).toBeVisible(); }); test("node projects", async ({ page }) => {