From 0999aa07412559501a35dd9e4b3ed701b36f33bf Mon Sep 17 00:00:00 2001 From: Cameron Garnham Date: Tue, 26 Mar 2024 10:27:55 +0800 Subject: [PATCH] dev: ci: enable rust stable workflows * also change container to use rust-stable --- .github/workflows/contract.yaml | 2 +- .github/workflows/deployment.yaml | 2 +- .github/workflows/testing.yaml | 6 +++--- Containerfile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/contract.yaml b/.github/workflows/contract.yaml index b38e0e8f..2777417e 100644 --- a/.github/workflows/contract.yaml +++ b/.github/workflows/contract.yaml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - toolchain: [nightly] + toolchain: [nightly, stable] steps: - id: checkout diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml index 91f8d86e..2a0f174f 100644 --- a/.github/workflows/deployment.yaml +++ b/.github/workflows/deployment.yaml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - toolchain: [nightly] + toolchain: [nightly, stable] steps: - id: checkout diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml index 8a54e898..620670f9 100644 --- a/.github/workflows/testing.yaml +++ b/.github/workflows/testing.yaml @@ -39,7 +39,7 @@ jobs: strategy: matrix: - toolchain: [nightly] + toolchain: [nightly, stable] steps: - id: checkout @@ -93,7 +93,7 @@ jobs: strategy: matrix: - toolchain: [nightly] + toolchain: [nightly, stable] steps: - id: checkout @@ -132,7 +132,7 @@ jobs: strategy: matrix: - toolchain: [nightly] + toolchain: [nightly, stable] steps: - id: setup diff --git a/Containerfile b/Containerfile index 77c7da66..590b0a13 100644 --- a/Containerfile +++ b/Containerfile @@ -3,13 +3,13 @@ # Torrust Tracker ## Builder Image -FROM rustlang/rust:nightly-bookworm as chef +FROM docker.io/library/rust:bookworm as chef WORKDIR /tmp RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash RUN cargo binstall --no-confirm cargo-chef cargo-nextest ## Tester Image -FROM rustlang/rust:nightly-bookworm-slim as tester +FROM docker.io/library/rust:slim-bookworm as tester WORKDIR /tmp RUN apt-get update; apt-get install -y curl sqlite3; apt-get autoclean