diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml index 769b1e4..f7e911b 100644 --- a/.github/workflows/client.yml +++ b/.github/workflows/client.yml @@ -31,12 +31,7 @@ jobs: with: targets: "${{ matrix.arch }}-apple-darwin" if: ${{ matrix.os.name == 'darwin' }} - - run: ./hack/ci/install-deps.sh - if: ${{ matrix.os.name == 'linux' }} - uses: homebrew/actions/setup-homebrew@master if: ${{ matrix.os.name == 'darwin' }} - - run: ./hack/ci/install-mac-deps.sh - if: ${{ matrix.os.name == 'darwin' }} - - run: ./hack/ci/install-windows-deps.sh - if: ${{ matrix.os.name == 'windows' }} + - run: ./hack/ci/install-${{ matrix.os.name }}-deps.sh - run: ./hack/build/cargo.sh build --bin kratactl diff --git a/.github/workflows/kernel.yml b/.github/workflows/kernel.yml index b913e13..57fafef 100644 --- a/.github/workflows/kernel.yml +++ b/.github/workflows/kernel.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - - run: ./hack/ci/install-deps.sh + - run: ./hack/ci/install-linux-deps.sh - run: ./hack/kernel/build.sh env: KRATA_KERNEL_BUILD_JOBS: "5" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index de7d1be..b8f4f7e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -19,7 +19,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: targets: "${{ matrix.arch }}-unknown-linux-gnu,${{ matrix.arch }}-unknown-linux-musl" - - run: ./hack/ci/install-deps.sh + - run: ./hack/ci/install-linux-deps.sh - run: ./hack/dist/bundle.sh env: KRATA_KERNEL_BUILD_JOBS: "5" diff --git a/.github/workflows/os.yml b/.github/workflows/os.yml index e12c0ad..01f2b28 100644 --- a/.github/workflows/os.yml +++ b/.github/workflows/os.yml @@ -26,7 +26,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: targets: "${{ matrix.arch }}-unknown-linux-gnu,${{ matrix.arch }}-unknown-linux-musl" - - run: ./hack/ci/install-deps.sh + - run: ./hack/ci/install-linux-deps.sh - run: ./hack/os/build.sh env: KRATA_KERNEL_BUILD_JOBS: "5" diff --git a/hack/ci/install-mac-deps.sh b/hack/ci/install-darwin-deps.sh similarity index 100% rename from hack/ci/install-mac-deps.sh rename to hack/ci/install-darwin-deps.sh diff --git a/hack/ci/install-deps.sh b/hack/ci/install-linux-deps.sh similarity index 100% rename from hack/ci/install-deps.sh rename to hack/ci/install-linux-deps.sh diff --git a/hack/ci/install-windows-deps.sh b/hack/ci/install-windows-deps.sh index 9d3f868..bddd72f 100644 --- a/hack/ci/install-windows-deps.sh +++ b/hack/ci/install-windows-deps.sh @@ -1,4 +1,4 @@ #!/bin/sh set -e -winget install protobuf +choco install protoc