Skip to content

Commit

Permalink
Merge torrust#760: dev: ci: enable rust stable workflows
Browse files Browse the repository at this point in the history
0999aa0 dev: ci: enable rust stable workflows (Cameron Garnham)

Pull request description:

  closes: torrust#580

  Re-enabled Rust Stable in Workflows and Container Building.

ACKs for top commit:
  da2ce7:
    ACK 0999aa0

Tree-SHA512: c281b6bd92ce634325364e9c4c299c0f4f7f683ae1e0c1924765881a3e18ae85b025e238968e5ab00a60baf52cafe8e83228d8ecbb36cc165bb38efd6555ee57
  • Loading branch information
da2ce7 committed Mar 26, 2024
2 parents c0450bd + 0999aa0 commit bf71687
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/contract.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
toolchain: [nightly]
toolchain: [nightly, stable]

steps:
- id: checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
toolchain: [nightly]
toolchain: [nightly, stable]

steps:
- id: checkout
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

strategy:
matrix:
toolchain: [nightly]
toolchain: [nightly, stable]

steps:
- id: checkout
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:

strategy:
matrix:
toolchain: [nightly]
toolchain: [nightly, stable]

steps:
- id: checkout
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:

strategy:
matrix:
toolchain: [nightly]
toolchain: [nightly, stable]

steps:
- id: setup
Expand Down
4 changes: 2 additions & 2 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bf71687

Please sign in to comment.