Skip to content

Commit

Permalink
refactor: update CI pipeline
Browse files Browse the repository at this point in the history
Using now rustup show instead of the dedicated action-rs/toolchain
github action. This allows using the .toml extension. Thanks
@atifaziz for pointing out
actions-rs/toolchain#126 (comment)
  • Loading branch information
Dariusz Parys committed Nov 15, 2022
1 parent 31ef4be commit 6d476ae
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN set -x && curl -sSL https://dot.net/v1/dotnet-install.sh | \
# prompt to rebuild the container nor the Docker build cache to be invalidated.
# Make sure to rebuild the container to ensure a fresh install of the new Rust
# version also works.
COPY ../rust-toolchain .
COPY ../rust-toolchain.toml .

# NB: we have to install also any components we need for our specific toolchain
# version.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
- ".github/workflows/e2e.yaml"
- 'Cargo.lock'
- 'Cargo.toml'
- 'rust-toolchain'
- 'rust-toolchain.toml'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -37,7 +37,7 @@ jobs:
sudo apt-get install cmake protobuf-compiler libprotobuf-dev
- name: Install stable toolchain
uses: actions-rs/toolchain@v1
run: rustup show

- name: Cache Dependencies
uses: Swatinem/rust-cache@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lt-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
- '.github/workflows/lt-ci.yml'
- 'Cargo.lock'
- 'Cargo.toml'
- 'rust-toolchain'
- 'rust-toolchain.toml'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -41,7 +41,7 @@ jobs:
- uses: actions/checkout@v2

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
run: rustup show

- name: Cache Dependencies
uses: Swatinem/rust-cache@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
- '.github/workflows/rust-ci.yml'
- 'Cargo.lock'
- 'Cargo.toml'
- 'rust-toolchain'
- 'rust-toolchain.toml'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Install protobuf-compiler
run: sudo apt-get install -y protobuf-compiler
- name: Install stable toolchain
uses: actions-rs/toolchain@v1
run: rustup show
- name: Cache Dependencies
uses: Swatinem/rust-cache@v1
- name: Run cargo-tarpaulin
Expand Down
2 changes: 1 addition & 1 deletion examples/applications/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ENV OPENSSL_DIR /musl

WORKDIR /sdv

COPY ./rust-toolchain .
COPY ./rust-toolchain.toml .

RUN rustup target add x86_64-unknown-linux-musl

Expand Down
File renamed without changes.

0 comments on commit 6d476ae

Please sign in to comment.