Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add rust-toolchain file #1557

Merged
merged 2 commits into from
Feb 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .github/workflows/benchmark_execution_time.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ jobs:
sudo apt -y update
sudo apt install libsystemd-dev librust-libdbus-sys-dev libseccomp-dev

- name: Setting rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
profile: minimal
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/[email protected]

- name: Building PR branch
run: make youki-release
Expand All @@ -51,12 +47,8 @@ jobs:
sudo apt -y update
sudo apt install libsystemd-dev librust-libdbus-sys-dev libseccomp-dev

- name: Setting rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
profile: minimal
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/[email protected]

- name: Building main branch
run: make youki-release
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/containerd_integration_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ jobs:
timeout-minutes: 15
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: '1.67.0'
override: true
- name: Cache youki
uses: Swatinem/rust-cache@v1
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/[email protected]
- run: sudo apt-get -y update
- run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
- name: Build youki
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/integration_tests_validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,10 @@ jobs:
if: ${{ !contains(needs.changes.outputs.dirs, '[]') }}
runs-on: ubuntu-20.04
timeout-minutes: 15
strategy:
matrix:
rust: [1.66.0, 1.67.0]
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
override: true
- name: Cache youki
uses: Swatinem/rust-cache@v1
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/[email protected]
- run: sudo apt-get -y update
- run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
- name: Install runc 1.1.0
Expand Down
44 changes: 10 additions & 34 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,11 @@ jobs:
timeout-minutes: 15
strategy:
matrix:
rust: [1.66.0, 1.67.0]
dirs: ${{ fromJSON(needs.changes.outputs.dirs) }}
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
override: true
- name: Cache youki
uses: Swatinem/rust-cache@v1
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/[email protected]
- run: rustup component add rustfmt clippy
- run: sudo apt-get -y update
- run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
Expand All @@ -53,17 +48,10 @@ jobs:
tests:
runs-on: ubuntu-20.04
timeout-minutes: 15
strategy:
matrix:
rust: [1.66.0, 1.67.0]
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
override: true
- name: Cache youki
uses: Swatinem/rust-cache@v1
- name: Install rus
run: rustup show
- run: sudo apt-get -y update
- run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
- name: Run tests
Expand All @@ -76,15 +64,10 @@ jobs:
name: Run test coverage
steps:
- uses: actions/checkout@v3
- name: Toolchain setup
uses: actions-rs/toolchain@v1
with:
toolchain: 1.67.0
override: true
profile: minimal
components: llvm-tools-preview
- name: Cache youki
uses: Swatinem/rust-cache@v1
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/[email protected]
- name: Install llvm-tools-preview
run: rustup component add llvm-tools-preview
- name: install cargo-llvm-cov
uses: taiki-e/install-action@v1
with:
Expand All @@ -105,19 +88,12 @@ jobs:
integration_tests:
runs-on: ubuntu-20.04
timeout-minutes: 15
strategy:
matrix:
rust: [1.66.0, 1.67.0]
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
override: true
- name: Cache youki
uses: Swatinem/rust-cache@v1
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/[email protected]
- run: sudo apt-get -y update
- run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
- uses: actions/setup-go@v2
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ jobs:
- run: sudo apt-get -y update
- run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev libclang-dev
- name: Set up cargo
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/[email protected]
- name: Build
run: make youki-release
- name: test
Expand All @@ -33,10 +31,8 @@ jobs:
- run: sudo apt-get -y update
- run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
- name: Set up cargo
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/[email protected]
- name: Release build
run: make youki-release
- name: Create output directory
Expand Down Expand Up @@ -104,11 +100,8 @@ jobs:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
steps:
- uses: actions/checkout@v3
- name: Set up cargo
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/[email protected]
- name: Publish libcgroups
run: cargo publish -p libcgroups --no-verify
- name: Publish libcontainer
Expand Down
3 changes: 3 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
profile="default"
channel="1.67.0"