From e48b8485955b9c6deb14d1aac815c786641eb42f Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Tue, 19 Nov 2024 07:13:46 -0500 Subject: [PATCH] CI: Switch from macos-12 to macos-13 GitHub Actions is removing support for `macos-12` (see https://github.com/actions/runner-images/issues/10721), so this switches SAW's CI from `macos-12` to `macos-13` in order to support an x86-64 version of macOS. --- .github/workflows/ci.yml | 6 +++--- saw-remote-api/Dockerfile | 2 +- saw/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb90a85cc5..44bb6f42c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ env: # ./saw-remote-api/Dockerfile # ./s2nTests/scripts/blst-entrypoint.sh # ./s2nTests/docker/saw.dockerfile - SOLVER_PKG_VERSION: "snapshot-20240212" + SOLVER_PKG_VERSION: "snapshot-20241119" jobs: config: @@ -96,13 +96,13 @@ jobs: hpc: true # Windows and macOS CI runners are more expensive than Linux runners, # so we only build one particular GHC version to test them on. We - # include both an x86-64 macOS runner (macos-12) as well as an AArch64 + # include both an x86-64 macOS runner (macos-13) as well as an AArch64 # macOS runner (macos-14). - os: windows-2019 ghc: 9.4.8 run-tests: true hpc: false - - os: macos-12 + - os: macos-13 ghc: 9.4.8 run-tests: true hpc: false diff --git a/saw-remote-api/Dockerfile b/saw-remote-api/Dockerfile index 357aece486..f7e876effe 100644 --- a/saw-remote-api/Dockerfile +++ b/saw-remote-api/Dockerfile @@ -31,7 +31,7 @@ WORKDIR /home/saw//rootfs/usr/local/bin # The URL here is based on the same logic used to specify BUILD_TARGET_OS and # BUILD_TARGET_ARCH in `.github/workflow/ci.yml`, but specialized to x86-64 # Ubuntu. -RUN curl -o solvers.zip -sL "https://github.com/GaloisInc/what4-solvers/releases/download/snapshot-20240212/ubuntu-22.04-X64-bin.zip" +RUN curl -o solvers.zip -sL "https://github.com/GaloisInc/what4-solvers/releases/download/snapshot-20241119/ubuntu-22.04-X64-bin.zip" RUN unzip solvers.zip && rm solvers.zip && chmod +x * USER root RUN chown -R root:root /home/saw/rootfs diff --git a/saw/Dockerfile b/saw/Dockerfile index d66f208f8c..9664eba45e 100644 --- a/saw/Dockerfile +++ b/saw/Dockerfile @@ -32,7 +32,7 @@ WORKDIR /home/saw//rootfs/usr/local/bin # The URL here is based on the same logic used to specify BUILD_TARGET_OS and # BUILD_TARGET_ARCH in `.github/workflow/ci.yml`, but specialized to x86-64 # Ubuntu. -RUN curl -o solvers.zip -sL "https://github.com/GaloisInc/what4-solvers/releases/download/snapshot-20240212/ubuntu-22.04-X64-bin.zip" +RUN curl -o solvers.zip -sL "https://github.com/GaloisInc/what4-solvers/releases/download/snapshot-20241119/ubuntu-22.04-X64-bin.zip" RUN unzip solvers.zip && rm solvers.zip && chmod +x * USER root RUN chown -R root:root /home/saw/rootfs