From 2232e3723ad7d96d6ed45ddcb6e61dd198470f2e Mon Sep 17 00:00:00 2001 From: Martijn Bastiaan Date: Fri, 29 Mar 2024 22:39:37 +0100 Subject: [PATCH] f --- .github/docker/Dockerfile | 2 +- .github/workflows/ci.yml | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile index 6c65e09..754c775 100644 --- a/.github/docker/Dockerfile +++ b/.github/docker/Dockerfile @@ -66,7 +66,7 @@ FROM builder AS run LABEL vendor="QBayLogic B.V." maintainer="devops@qbaylogic.com" ENV DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 LC_ALL=C.UTF-8 PATH="$PATH:/opt/bin:/root/.ghcup/bin" -ARG DEPS_RUNTIME="gnupg pkg-config openjdk-8-jdk gdb picocom libtinfo5 libtinfo-dev build-essential curl libc6-dev libgmp10-dev python3 ccache libftdi1 libhidapi-hidraw0 libusb-1.0-0 libyaml-0-2" +ARG DEPS_RUNTIME="gnupg pkg-config openjdk-8-jdk gdb-multiarch picocom libtinfo5 libtinfo-dev build-essential curl libc6-dev libgmp10-dev python3 ccache libftdi1 libhidapi-hidraw0 libusb-1.0-0 libyaml-0-2" RUN apt-get update \ && apt-get install -y --no-install-recommends $DEPS_RUNTIME \ && echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list \ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ae2b44..6cf4d0c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -166,13 +166,6 @@ jobs: run: | ln -s /opt/bin/openocd /opt/bin/openocd-vexriscv - - name: Install dependencies - run: | - apt-get update - apt-get remove gdb -y - apt get install -y gdb-multiarch - apt-get install -y libftdi1 libhidapi-hidraw0 libusb-1.0-0 libyaml-0-2 - - name: Run `clash-vexriscv` unittests run: | cabal run clash-vexriscv:unittests