Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI fixes for #1598, #1599 #1600

Merged
merged 6 commits into from
Jan 4, 2024
Merged

CI fixes for #1598, #1599 #1600

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e176ce
Switch from haskell/actions/setup to haskell-actions/setup
RyanGlScott Jan 4, 2024
4d39471
Pin alex to 3.4.0.1 in cryptol-remote-api Dockerfile
RyanGlScott Jan 4, 2024
2d781a2
Dockerfiles: Sync cabal-install version with CI
RyanGlScott Jan 4, 2024
88cc752
cryptol-remote-api Dockerfile: Add /root/.local/bin to PATH
RyanGlScott Jan 4, 2024
e72ca1f
Dockerfiles: Consistently factor out GHCVER, CABALVER
RyanGlScott Jan 4, 2024
5e0ea61
cryptol-remote-api Dockerfile: Factor out {ALEX,HAPPY}VER, documentation
RyanGlScott Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
with:
poetry-version: 1.4.2

- uses: haskell/actions/setup@v2
- uses: haskell-actions/setup@v2
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc-version }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN mkdir -p /home/cryptol/.local/bin && \
chmod +x /home/cryptol/.local/bin/ghcup
RUN mkdir -p /home/cryptol/.ghcup && \
ghcup --version && \
ghcup install cabal 3.6.2.0 && \
ghcup install cabal 3.10.1.0 && \
ghcup install ghc 9.2.8 && \
ghcup set ghc 9.2.8
RUN cabal v2-update && \
Expand Down
10 changes: 7 additions & 3 deletions cryptol-remote-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ RUN apt-get update && \
ENV LANG=C.UTF-8 \
LC_ALL=C.UTF-8
ENV GHCUP_INSTALL_BASE_PREFIX=/opt \
PATH=/opt/.ghcup/bin:$PATH
PATH=/opt/.ghcup/bin:/root/.local/bin:$PATH
RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.19.4/x86_64-linux-ghcup-0.1.19.4" && \
chmod +x /usr/local/bin/ghcup
RUN ghcup install cabal --set
RUN ghcup install cabal 3.10.1.0 --set
ENV PATH=/root/.cabal/bin:$PATH
ADD ./cryptol-remote-api/ghc-portability.patch .
ARG GHCVER
Expand All @@ -27,7 +27,11 @@ RUN if ${PORTABILITY}; then \
ghcup install ghc ${GHCVER_BOOTSTRAP} && \
ghcup set ghc ${GHCVER_BOOTSTRAP} && \
cabal v2-update && \
cabal v2-install alex happy-1.20.1.1 && \
# We pin specific versions of alex and happy that are necessary to build
# GHC. In general, we don't want to build the latest versions of each
# tool, as GHC may not support them (see, for example,
# https://gitlab.haskell.org/ghc/ghc/-/issues/24302).
cabal v2-install alex-3.4.0.1 happy-1.20.1.1 && \
RyanGlScott marked this conversation as resolved.
Show resolved Hide resolved
git clone --recurse-submodules --depth 1 --branch ghc-${GHCVER}-release https://gitlab.haskell.org/ghc/ghc.git && \
cd ./ghc && \
git apply ../ghc-portability.patch && \
Expand Down
Loading