From 0cfe0063ab35ae9dde62de3814090838e313fcc1 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Mon, 18 Dec 2023 17:19:25 +0100 Subject: [PATCH] fix(workflows/integration): Remove unecessary rustup installation --- .github/workflows/integration.yaml | 25 +++++++++---------------- tests/api.sh | 1 + tests/routed.sh | 1 + 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index d6b3a0205..c7cda8855 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -15,31 +15,24 @@ name: integration on: push: - branches: [ '**' ] + branches: ["**"] pull_request: - branches: [ '**' ] + branches: ["**"] schedule: - - cron: '0 6 * * 1-5' + - cron: "0 6 * * 1-5" jobs: build: - name: Build on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macOS-latest ] + os: [ubuntu-latest, macOS-latest] steps: - - uses: actions/checkout@v4 - - - name: Install latest stable - uses: actions-rs/toolchain@v1.0.7 - with: - toolchain: stable - override: true - components: rustfmt, clippy + - name: Clone this repository + uses: actions/checkout@v4 - name: Compile debug run: make all @@ -52,8 +45,8 @@ jobs: - name: Test debug run: make test env: - BUILD_TYPE: Debug # Workaround for Windows as it seems the previous step is being ignored - BUILD_TESTING: OFF # Workaround for Windows as it seems the previous step is being ignored - BUILD_MULTICAST: OFF # Workaround for Windows as it seems the previous step is being ignored + BUILD_TYPE: Debug # Workaround for Windows as it seems the previous step is being ignored + BUILD_TESTING: OFF # Workaround for Windows as it seems the previous step is being ignored + BUILD_MULTICAST: OFF # Workaround for Windows as it seems the previous step is being ignored BUILD_INTEGRATION: ON # Workaround for Windows as it seems the previous step is being ignored ZENOH_BRANCH: master diff --git a/tests/api.sh b/tests/api.sh index 7be9183b3..01f37c499 100644 --- a/tests/api.sh +++ b/tests/api.sh @@ -34,6 +34,7 @@ if [ ! -f zenohd ]; then if [ -n "$ZENOH_BRANCH" ]; then git switch "$ZENOH_BRANCH" fi + rustup show cargo build --lib --bin zenohd cp ./target/debug/zenohd "$TESTDIR"/ cd "$TESTDIR"|| exit diff --git a/tests/routed.sh b/tests/routed.sh index 72659e075..9a89057a0 100644 --- a/tests/routed.sh +++ b/tests/routed.sh @@ -34,6 +34,7 @@ if [ ! -f zenohd ]; then if [ -n "$ZENOH_BRANCH" ]; then git switch "$ZENOH_BRANCH" fi + rustup show cargo build --lib --bin zenohd cp ./target/debug/zenohd "$TESTDIR"/ cd "$TESTDIR" || exit