diff --git a/.github/actions/with-k-docker/Dockerfile b/.github/actions/with-k-docker/Dockerfile index 97df8ea4fb5..09f800e3669 100644 --- a/.github/actions/with-k-docker/Dockerfile +++ b/.github/actions/with-k-docker/Dockerfile @@ -5,9 +5,11 @@ FROM ubuntu:${BASE_DISTRO} ARG K_DEB_PATH ARG INSTALL_BACKEND_DEBS ARG LLVM_BACKEND_DEB_PATH +ARG HASKELL_BACKEND_DEB_PATH COPY ${K_DEB_PATH} /kframework.deb COPY ${LLVM_BACKEND_DEB_PATH} /llvm-backend.deb +COPY ${HASKELL_BACKEND_DEB_PATH} /haskell-backend.deb RUN apt-get -y update \ && apt-get -y install \ @@ -19,7 +21,7 @@ RUN apt-get -y update \ /kframework.deb RUN if [ "${INSTALL_BACKEND_DEBS}" = "true" ]; then \ - apt-get -y install /llvm-backend.deb; \ + apt-get -y install /llvm-backend.deb /haskell-backend.deb; \ fi RUN apt-get -y clean diff --git a/.github/actions/with-k-docker/action.yml b/.github/actions/with-k-docker/action.yml index 62c75bed3e1..f5b67cabdc2 100644 --- a/.github/actions/with-k-docker/action.yml +++ b/.github/actions/with-k-docker/action.yml @@ -42,6 +42,7 @@ runs: DOCKERFILE=${{ github.action_path }}/Dockerfile K_DEB_PATH=${{ inputs.k-deb-path }} LLVM_BACKEND_DEB_PATH=llvm-backend.deb + HASKELL_BACKEND_DEB_PATH=haskell-backend.deb gh release download \ --repo runtimeverification/llvm-backend \ @@ -49,13 +50,20 @@ runs: --output "${LLVM_BACKEND_DEB_PATH}" \ v$(cat deps/llvm-backend_release) + gh release download \ + --repo runtimeverification/haskell-backend \ + --pattern "*ubuntu_${BASE_DISTRO}.deb" \ + --output "${HASKELL_BACKEND_DEB_PATH}" \ + $(cat deps/haskell-backend_release) + docker build . \ --file ${DOCKERFILE} \ --tag ${TAG} \ --build-arg BASE_DISTRO=${BASE_DISTRO} \ --build-arg K_DEB_PATH=${K_DEB_PATH} \ --build-arg INSTALL_BACKEND_DEBS=${INSTALL_BACKEND_DEBS} \ - --build-arg LLVM_BACKEND_DEB_PATH=${LLVM_BACKEND_DEB_PATH} + --build-arg LLVM_BACKEND_DEB_PATH=${LLVM_BACKEND_DEB_PATH} \ + --build-arg HASKELL_BACKEND_DEB_PATH=${HASKELL_BACKEND_DEB_PATH} - name: 'Run Docker container' shell: bash {0} diff --git a/package/debian/kframework-frontend/rules.jammy b/package/debian/kframework-frontend/rules.jammy index 5f62a9bc885..def7df0d9e3 100755 --- a/package/debian/kframework-frontend/rules.jammy +++ b/package/debian/kframework-frontend/rules.jammy @@ -23,7 +23,7 @@ export PREFIX dh $@ override_dh_auto_build: - mvn --batch-mode package -DskipTests -Dllvm.backend.skip + mvn --batch-mode package -DskipTests -Dllvm.backend.skip -Dhaskell.backend.skip override_dh_auto_install: package/package --frontend