diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d70b5ab3..3881f497 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,12 @@ on: workflow_dispatch: env: + # The solver package snapshot date. If you update this, make sure to also + # update it in the following locations: + # + # - Dockerfile + # - cryptol-remote-api/Dockerfile + # - README.md SOLVER_PKG_VERSION: "snapshot-20230711" # The CACHE_VERSION can be updated to force the use of a new cache if # the current cache contents become corrupted/invalid. This can @@ -121,6 +127,12 @@ jobs: - shell: bash run: .github/ci.sh install_system_deps env: + # The full zip file name for a what4-solvers bindist. If you update + # this, make sure to also update it in the following locations: + # + # - The other BIN_ZIP_FILE in the `test` job + # - Dockerfile + # - cryptol-remote-api/Dockerfile BIN_ZIP_FILE: ${{ matrix.os }}-${{ runner.arch }}-bin.zip - shell: bash @@ -293,6 +305,12 @@ jobs: - shell: bash env: + # The full zip file name for a what4-solvers bindist. If you update + # this, make sure to also update it in the following locations: + # + # - The other BIN_ZIP_FILE in the `build` job + # - Dockerfile + # - cryptol-remote-api/Dockerfile BIN_ZIP_FILE: ${{ matrix.os }}-${{ runner.arch }}-bin.zip run: | set -x diff --git a/Dockerfile b/Dockerfile index d3bce2d0..2f547d25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,8 @@ USER cryptol WORKDIR /cryptol RUN mkdir -p rootfs/usr/local/bin WORKDIR /cryptol/rootfs/usr/local/bin +# The URL here is based on the same logic used to specify BIN_ZIP_FILE 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-20230711/ubuntu-22.04-X64-bin.zip" RUN unzip solvers.zip && rm solvers.zip && chmod +x * WORKDIR /cryptol diff --git a/cryptol-remote-api/Dockerfile b/cryptol-remote-api/Dockerfile index 8f88d1f5..d3d72530 100644 --- a/cryptol-remote-api/Dockerfile +++ b/cryptol-remote-api/Dockerfile @@ -64,6 +64,8 @@ ENV PATH=/usr/local/bin:/cryptol/rootfs/usr/local/bin:$PATH RUN mkdir -p rootfs/"${CRYPTOLPATH}" \ && cp -r lib/* rootfs/"${CRYPTOLPATH}" WORKDIR /cryptol/rootfs/usr/local/bin +# The URL here is based on the same logic used to specify BIN_ZIP_FILE in +# `.github/workflow/ci.yml`, but specialized to x86-64 Ubuntu. RUN curl -sL -o solvers.zip "https://github.com/GaloisInc/what4-solvers/releases/download/snapshot-20230711/ubuntu-22.04-X64-bin.zip" && \ unzip solvers.zip && rm solvers.zip && chmod +x * USER root