github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-02 00:02:01 +00:00
Code Issues Projects Releases Wiki Activity

ci: Move musl-tools installation into Setup rust

Browse Source 
`musl-tools` is only needed when a component needs `rust`, and the
`instance` running is of `x86_64` or `aarch64`.

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
This commit is contained in:
Ruoqing He 2025-03-04 23:22:04 +08:00
parent 09030ee96e
commit 186c88b1d5
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/build-checks-preview-riscv64.yaml vendored
View File

@ -66,14 +66,14 @@ jobs:
run: | run: |
./tests/install_go.sh -f -p ./tests/install_go.sh -f -p
echo "/usr/local/go/bin" >> "$GITHUB_PATH" echo "/usr/local/go/bin" >> "$GITHUB_PATH"
- name: Install rust - name: Setup rust
if: contains(matrix.component.needs, 'rust') if: contains(matrix.component.needs, 'rust')
run: | run: |
./tests/install_rust.sh ./tests/install_rust.sh
echo "${HOME}/.cargo/bin" >> "$GITHUB_PATH" echo "${HOME}/.cargo/bin" >> "$GITHUB_PATH"
- name: Install musl-tools if [ "$(uname -m)" == "x86_64" ] || [ "$(uname -m)" == "aarch64" ]; then
if: contains(matrix.component.needs, 'musl-tools') sudo apt-get -y install musl-tools
run: sudo apt-get -y install musl-tools fi
- name: Install devicemapper - name: Install devicemapper
if: contains(matrix.component.needs, 'libdevmapper') && matrix.command == 'make check' if: contains(matrix.component.needs, 'libdevmapper') && matrix.command == 'make check'
run: sudo apt-get -y install libdevmapper-dev run: sudo apt-get -y install libdevmapper-dev

15
.github/workflows/build-checks.yaml vendored
View File

@ -22,7 +22,6 @@ jobs:
path: src/agent path: src/agent
needs: needs:
- rust - rust
- musl-tools
- libdevmapper - libdevmapper
- libseccomp - libseccomp
- protobuf-compiler - protobuf-compiler
@ -31,7 +30,6 @@ jobs:
path: src/dragonball path: src/dragonball
needs: needs:
- rust - rust
- musl-tools
- name: runtime - name: runtime
path: src/runtime path: src/runtime
needs: needs:
@ -41,29 +39,24 @@ jobs:
path: src/runtime-rs path: src/runtime-rs
needs: needs:
- rust - rust
- musl-tools
- name: agent-ctl - name: agent-ctl
path: src/tools/agent-ctl path: src/tools/agent-ctl
needs: needs:
- rust - rust
- musl-tools
- protobuf-compiler - protobuf-compiler
- clang - clang
- name: kata-ctl - name: kata-ctl
path: src/tools/kata-ctl path: src/tools/kata-ctl
needs: needs:
- rust - rust
- musl-tools
- name: trace-forwarder - name: trace-forwarder
path: src/tools/trace-forwarder path: src/tools/trace-forwarder
needs: needs:
- rust - rust
- musl-tools
- name: genpolicy - name: genpolicy
path: src/tools/genpolicy path: src/tools/genpolicy
needs: needs:
- rust - rust
- musl-tools
- protobuf-compiler - protobuf-compiler
steps: steps:
@ -88,14 +81,14 @@ jobs:
run: | run: |
./tests/install_go.sh -f -p ./tests/install_go.sh -f -p
echo "/usr/local/go/bin" >> "$GITHUB_PATH" echo "/usr/local/go/bin" >> "$GITHUB_PATH"
- name: Install rust - name: Setup rust
if: contains(matrix.component.needs, 'rust') if: contains(matrix.component.needs, 'rust')
run: | run: |
./tests/install_rust.sh ./tests/install_rust.sh
echo "${HOME}/.cargo/bin" >> "$GITHUB_PATH" echo "${HOME}/.cargo/bin" >> "$GITHUB_PATH"
- name: Install musl-tools if [ "$(uname -m)" == "x86_64" ] || [ "$(uname -m)" == "aarch64" ]; then
if: contains(matrix.component.needs, 'musl-tools') sudo apt-get -y install musl-tools
run: sudo apt-get -y install musl-tools fi
- name: Install devicemapper - name: Install devicemapper
if: contains(matrix.component.needs, 'libdevmapper') && matrix.command == 'make check' if: contains(matrix.component.needs, 'libdevmapper') && matrix.command == 'make check'
run: sudo apt-get -y install libdevmapper-dev run: sudo apt-get -y install libdevmapper-dev