Merge pull request #1377 from crytic/dev-update-hevm

Update `hevm`, move to GHC 9.8

Author: elopez

.github/container-linux-static/Dockerfile

@@ -1,56 +1,13 @@
-FROM alpine:3.18.6
-# Based on https://github.com/fpco/alpine-haskell-stack/blob/9.2.8v2/ghc-Dockerfile
+FROM docker.io/benz0li/ghc-musl:9.8.4
+# https://gitlab.com/benz0li/ghc-musl
 
 RUN apk upgrade --no-cache &&\
     apk add --no-cache \
-        curl \
-        gcc \
-        git \
-        libc-dev \
-        xz \
-        gmp-dev \
         autoconf \
         automake \
-        binutils \
-        build-base \
-        coreutils \
-        cpio \
-        linux-headers \
-        libffi-dev \
-        musl-dev \
-        zlib-dev \
-        zlib-static \
-        ncurses-dev \
-        ncurses-libs \
-        ncurses-static \
-        bash \
-        lld \
-        shadow # for stack --docker, provides groupadd
-
-RUN curl -sSLo /usr/local/bin/stack https://github.com/commercialhaskell/stack/releases/download/v2.13.1/stack-2.13.1-linux-x86_64-bin && \
-    chmod +x /usr/local/bin/stack
-
-# https://stackoverflow.com/a/41517423
-RUN ln -s /usr/lib/libncurses.a /usr/lib/libtinfo.a
-
-COPY stack-config.yaml /root/.stack/config.yaml
-
-RUN cd /tmp && \
-    curl -sSLo /tmp/ghc.tar.xz https://downloads.haskell.org/~ghc/9.6.5/ghc-9.6.5-x86_64-alpine3_12-linux.tar.xz && \
-    tar xf ghc.tar.xz && \
-    cd ghc-9.6.5-x86_64-unknown-linux && \
-    ./configure --prefix=/usr/local && \
-    make install && \
-    rm -rf /tmp/ghc.tar.xz /tmp/ghc-9.6.5-x86_64-unknown-linux
-
-RUN apk upgrade --no-cache &&\
-    apk add --no-cache \
+        binutils-gold \
         cmake \
-        libtool \
-        openssl-dev \
-        tar \
-        zlib-dev \
-        zlib-static
+        libtool
 
 RUN addgroup \
         --gid 115 \
@@ -65,8 +22,7 @@ RUN addgroup \
         runneruser
 
 RUN mkdir -p /etc/stack &&\
-    { cat /root/.stack/config.yaml ;\
-      echo "system-ghc: true" ;\
+    { echo "system-ghc: true" ;\
       echo "install-ghc: false" ;\
       echo "skip-ghc-check: true" ;\
     } >> /etc/stack/config.yaml &&\

.github/container-linux-static/README.md

@@ -2,7 +2,7 @@
 
 This container is used as part of `.github/workflows/ci.yml` to produce
 statically-linked amd64 linux builds of Echidna. It is based on the following
-container produced by FP Complete and maintained in the
-[`fpco/alpine-haskell-stack`](https://github.com/fpco/alpine-haskell-stack/tree/ghc927)
+container produced by Olivier Benz and maintained in the
+[`benz0li/ghc-musl`](https://gitlab.com/benz0li/ghc-musl)
 repository, and contains a few extra dependencies and configurations to make it
 suitable for the GitHub Actions environment.

.github/container-linux-static/stack-config.yaml

@@ -9,7 +9,7 @@ if [ -f $HOME/.local/lib/libsecp256k1.a ]; then
   exit 0
 fi
 
-INSTALL_VERSION=0.5.0
+INSTALL_VERSION=0.6.0
 curl -LO "https://github.com/bitcoin-core/secp256k1/archive/v$INSTALL_VERSION.zip"
 
 unzip "v$INSTALL_VERSION.zip" && rm "v$INSTALL_VERSION.zip"

.github/scripts/install-libsecp256k1.sh

@@ -22,7 +22,7 @@ jobs:
         include:
           - os: ubuntu-latest
             shell: bash
-            container: "{\"image\": \"elopeztob/alpine-haskell-stack-echidna:ghc-9.6.5\", \"options\": \"--user 1001\"}"
+            container: "{\"image\": \"elopeztob/alpine-haskell-stack-echidna:ghc-9.8.4\", \"options\": \"--user 1001\"}"
           - os: macos-13 # x86_64 macOS
             shell: bash
           - os: windows-latest
@@ -65,14 +65,24 @@ jobs:
         id: stack
         if: matrix.container == ''
         with:
-          ghc-version: '9.6.5'
+          ghc-version: '9.8.4'
           enable-stack: true
           stack-version: 'latest'
 
       - name: Configure Stack environment
         run: |
           HOME="${{ (runner.os == 'Windows' && '$(cygpath -m ~)') || '$HOME' }}"
+          # This relative path works only if GHC was installed using chocolatey, but not when it was installed with ghcup
           GHC_MINGW_PATH="${{ (runner.os == 'Windows' && '$(cygpath -m "$GHC_BIN_PATH/../mingw")') || '' }}"
+          if [ -n "$GHC_MINGW_PATH" ] && [ ! -d "$GHC_MINGW_PATH" ]; then
+            echo "The expected GHC_MINGW_PATH directory $GHC_MINGW_PATH does not exist"
+            echo "Trying to locate it via ghcup"
+            GHCUP_PATH=$(cygpath -m "C:\ghcup\bin\ghcup.exe")
+            GHC_REAL_PATH=$("$GHCUP_PATH" whereis ghc "$GHC_VERSION" | tr -d '\r')
+            GHC_MINGW_PATH="$(cygpath -m "$(dirname $GHC_REAL_PATH)"/../mingw)"
+          fi
+          echo "GHC_MINGW_PATH=$GHC_MINGW_PATH" >> "$GITHUB_ENV"
+
           mkdir -p "$STACK_ROOT"
           { echo "extra-include-dirs:";
             echo "- $HOME/.local/include";
@@ -100,12 +110,13 @@ jobs:
           REPLACE_LINKER_WIN: ${{ (runner.os == 'Windows' && 'true') || 'false' }}
           SKIP_MSYS: ${{ (runner.os == 'Windows' && 'true') || 'false' }}
           GHC_BIN_PATH: ${{ steps.stack.outputs.ghc-path }}
+          GHC_VERSION: ${{ steps.stack.outputs.ghc-version }}
 
       - name: Configure Haskell paths (Windows)
         if: runner.os == 'Windows'
         run: |
           HASKELL_PATHS="$(cygpath -u "$GHC_PATH"):$(cygpath -u "$CABAL_PATH"):$(cygpath -u "$STACK_PATH")"
-          HASKELL_MINGW_PATH="$(cygpath -u "$GHC_PATH/../mingw")"
+          HASKELL_MINGW_PATH="$(cygpath -u "$GHC_MINGW_PATH")"
           SYSTEM_MINGW_PATH="$(cygpath -m "$MSYS2_LOCATION/$MSYSTEM")"
           echo "HASKELL_PATHS=$HASKELL_PATHS" >> "$GITHUB_ENV"
           echo "HASKELL_MINGW_PATH=$HASKELL_MINGW_PATH" >> "$GITHUB_ENV"

.github/workflows/ci.yml

@@ -25,6 +25,10 @@ jobs:
             name: Linux (x86_64)
             tuple: x86_64-linux
             timeout: 180
+          - os: ubuntu-24.04-arm
+            name: Linux (aarch64)
+            tuple: aarch64-linux
+            timeout: 180
           - os: macos-13
             name: macOS (x86_64)
             tuple: x86_64-macos