diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 60773ae..dec0a5e 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -41,7 +41,8 @@ jobs: - uses: docker://arm64v8/ubuntu:focal name: Cleanup with: - args: rm -rf .ghcup/ + args: rm -rf .ghcup/ cabal/ dist-newstyle/ out/ + - name: Checkout uses: actions/checkout@v3 - name: Set up Docker Buildx diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 450832c..de5779f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,8 +13,8 @@ on: - cron: '0 2 * * *' jobs: - build-alpine: - name: Build static linux binary + build-linux: + name: Build linux binary runs-on: ${{ matrix.os }} env: CABAL_VER: 3.6.2.0 @@ -203,9 +203,9 @@ jobs: ./out/* - test-alpine: + test-linux: name: Test linux - needs: "build-alpine" + needs: "build-linux" runs-on: ${{ matrix.os }} env: CABAL_VER: 3.6.2.0 @@ -379,7 +379,7 @@ jobs: HOMEBREW_CHANGE_ARCH_TO_ARM: 1 hls: name: hls - needs: build-alpine + needs: build-linux runs-on: ubuntu-latest env: GHC_VERSION: "8.10.7" @@ -410,7 +410,7 @@ jobs: release: name: release - needs: ["test-alpine", "test-arm", "test-macwin", "hls"] + needs: ["test-linux", "test-arm", "test-macwin", "hls"] runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags/v') steps: diff --git a/docker/arm32v7/Dockerfile b/docker/arm32v7/Dockerfile index 4a9656f..d969be7 100644 --- a/docker/arm32v7/Dockerfile +++ b/docker/arm32v7/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update && \ openssh-client \ xz-utils \ zlib1g-dev \ - libnuma-dev libgmp10 libssl-dev liblzma-dev libbz2-dev wget lsb-release software-properties-common apt-transport-https gcc autoconf automake build-essential gzip \ + libnuma-dev libgmp10 libssl-dev liblzma-dev libbz2-dev wget lsb-release software-properties-common apt-transport-https gcc autoconf automake build-essential gzip patchelf tree \ llvm-9 clang-9 && \ rm -rf /var/lib/apt/lists/* diff --git a/docker/arm64v8/Dockerfile b/docker/arm64v8/Dockerfile index 4eeffdf..6849a1b 100644 --- a/docker/arm64v8/Dockerfile +++ b/docker/arm64v8/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update && \ openssh-client \ xz-utils \ zlib1g-dev \ - libnuma-dev libgmp10 libssl-dev liblzma-dev libbz2-dev wget lsb-release software-properties-common apt-transport-https gcc autoconf automake build-essential gzip \ + libnuma-dev libgmp10 libssl-dev liblzma-dev libbz2-dev wget lsb-release software-properties-common apt-transport-https gcc autoconf automake build-essential gzip patchelf tree \ llvm-9 clang-9 && \ rm -rf /var/lib/apt/lists/*