From 47eb597dd691de6d610c2bb3f61a5144fb346c8d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell <andrew@tridgell.net> Date: Tue, 29 Aug 2023 11:43:43 +1000 Subject: [PATCH] CI: don't load vcan kernel modules not needed any more --- .github/workflows/test_coverage.yml | 8 -------- .github/workflows/test_sitl_periph.yml | 9 --------- 2 files changed, 17 deletions(-) diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml index b6c5403ac7..4c9ff4cc93 100644 --- a/.github/workflows/test_coverage.yml +++ b/.github/workflows/test_coverage.yml @@ -56,14 +56,6 @@ jobs: - name: setup ccache run: | . .github/workflows/ccache.env - - name: Configure CAN - if: ${{ matrix.config == 'sitltest-can'}} - run: | - sudo apt-get update - sudo apt-get -y install can-utils iproute2 linux-modules-extra-$(uname -r) - sudo modprobe vcan - sudo ip link add dev vcan0 type vcan - sudo ip link set up vcan0 - name: test ${{matrix.config}} ${{ matrix.toolchain }} env: CI_BUILD_TARGET: ${{matrix.config}} diff --git a/.github/workflows/test_sitl_periph.yml b/.github/workflows/test_sitl_periph.yml index 7c8d8d1415..7ade9cfd4b 100644 --- a/.github/workflows/test_sitl_periph.yml +++ b/.github/workflows/test_sitl_periph.yml @@ -230,15 +230,6 @@ jobs: - name: setup ccache run: | . .github/workflows/ccache.env - - name: setup can-utils - run: | - kernel_ver=`uname -r` - if [ "$kernel_ver" = "5.4.0-1032-azure" ] || [ "$kernel_ver" = "5.11.4-051104-generic" ]; then echo "Unsupported Kernel $kernel_ver" && exit 0; fi; - sudo apt-get update - sudo apt-get -y install can-utils iproute2 linux-modules-extra-$(uname -r) - sudo modprobe vcan - sudo ip link add dev vcan0 type vcan - sudo ip link set up vcan0 - name: test ${{matrix.config}} env: CI_BUILD_TARGET: ${{matrix.config}}