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

Jump to bottom

Support building with GHC 9.6 #1102

Merged
merged 4 commits into from
Aug 3, 2023
Merged

Support building with GHC 9.6 #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5b9545
Whitespace only
RyanGlScott Aug 3, 2023
86f0001
Support building with GHC 9.6
RyanGlScott Jul 28, 2023
b62ca76
crucible-mir: Don't use deprecated TypeInType extension
RyanGlScott Aug 3, 2023
64e0a39
CI: Test GHC 9.2.8, 9.4.5, 9.6.2
RyanGlScott Aug 3, 2023
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
8 changes: 4 additions & 4 deletions .github/Dockerfile-crux-llvm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ RUN mkdir -p /root/ghcup-download/bin && \
chmod +x /root/ghcup-download/bin/ghcup
RUN mkdir -p /root/.ghcup && \
ghcup --version && \
ghcup install cabal 3.6.2.0 && \
ghcup install ghc 8.8.4 && \
ghcup set ghc 8.8.4
ghcup install cabal 3.10.1.0 && \
ghcup install ghc 9.2.8 && \
ghcup set ghc 9.2.8
RUN cabal v2-update

ARG DIR=/crux-llvm
Expand All @@ -41,7 +41,7 @@ ADD crux ${DIR}/build/crux
ADD crux-llvm ${DIR}/build/crux-llvm
ADD dependencies ${DIR}/build/dependencies
ADD .github/cabal.project.crux-llvm ${DIR}/build/cabal.project
ADD cabal.GHC-8.8.4.config ${DIR}/build/cabal.project.freeze
ADD cabal.GHC-9.2.8.config ${DIR}/build/cabal.project.freeze
# Workaround until we have an LLVM 12 build available
RUN cp $DIR/build/crux-llvm/c-src/libcxx-7.1.0.bc $DIR/build/crux-llvm/c-src/libcxx-12.0.1.bc

Expand Down
8 changes: 4 additions & 4 deletions .github/Dockerfile-crux-mir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ RUN mkdir -p /root/ghcup-download/bin && \
chmod +x /root/ghcup-download/bin/ghcup
RUN mkdir -p /root/.ghcup && \
ghcup --version && \
ghcup install cabal 3.6.2.0 && \
ghcup install ghc 8.8.4 && \
ghcup set ghc 8.8.4
ghcup install cabal 3.10.1.0 && \
ghcup install ghc 9.2.8 && \
ghcup set ghc 9.2.8
RUN cabal v2-update

ARG DIR=/crux-mir
Expand All @@ -57,7 +57,7 @@ ADD crux ${DIR}/build/crux
ADD crux-mir ${DIR}/build/crux-mir
ADD dependencies ${DIR}/build/dependencies
ADD .github/cabal.project.crux-mir ${DIR}/build/cabal.project
ADD cabal.GHC-8.8.4.config ${DIR}/build/cabal.project.freeze
ADD cabal.GHC-9.2.8.config ${DIR}/build/cabal.project.freeze

WORKDIR ${DIR}/build
RUN cabal v2-build --only-dependencies crux-mir
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/crucible-go-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
cabal: ["3.8.1.0"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8", "9.4.5", "9.6.2"]
include:
- os: macos-12
cabal: 3.8.1.0
ghc: 9.4.4
cabal: 3.10.1.0
ghc: 9.6.2
- os: windows-2019
cabal: 3.8.1.0
ghc: 9.4.4
cabal: 3.10.1.0
ghc: 9.6.2
name: crucible-go - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -86,8 +86,9 @@ jobs:
run: |
GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
case ${{ matrix.ghc }} in
9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.2.8) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
9.4.5) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
9.6.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
*) GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
esac
echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/crucible-jvm-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
cabal: ["3.8.1.0"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8", "9.4.5", "9.6.2"]
include:
- os: macos-12
cabal: 3.8.1.0
ghc: 9.4.4
cabal: 3.10.1.0
ghc: 9.6.2
- os: windows-2019
cabal: 3.8.1.0
ghc: 9.4.4
cabal: 3.10.1.0
ghc: 9.6.2
name: crucible-jvm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -86,8 +86,9 @@ jobs:
run: |
GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
case ${{ matrix.ghc }} in
9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.2.8) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
9.4.5) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
9.6.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
*) GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
esac
echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/crucible-wasm-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
cabal: ["3.8.1.0"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8", "9.4.5", "9.6.2"]
include:
- os: macos-12
cabal: 3.8.1.0
ghc: 9.4.4
cabal: 3.10.1.0
ghc: 9.6.2
- os: windows-2019
cabal: 3.8.1.0
ghc: 9.4.4
cabal: 3.10.1.0
ghc: 9.6.2
name: crucible-wasm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -86,8 +86,9 @@ jobs:
run: |
GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
case ${{ matrix.ghc }} in
9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.2.8) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
9.4.5) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
9.6.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
*) GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
esac
echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV
Expand Down
25 changes: 13 additions & 12 deletions .github/workflows/crux-llvm-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,21 +64,21 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
cabal: ["3.8.1.0"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8", "9.4.5", "9.6.2"]
include:
- os: ubuntu-22.04
cabal: 3.8.1.0
ghc: 8.8.4
cabal: 3.10.1.0
ghc: 8.10.7
- os: ubuntu-20.04
cabal: 3.8.1.0
ghc: 9.4.4
cabal: 3.10.1.0
ghc: 9.6.2
- os: macos-12
cabal: 3.8.1.0
ghc: 9.2.7
cabal: 3.10.1.0
ghc: 9.2.8
- os: windows-2019
cabal: 3.8.1.0
ghc: 9.2.7
cabal: 3.10.1.0
ghc: 9.2.8
name: crux-llvm - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -129,8 +129,9 @@ jobs:
run: |
GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
case ${{ matrix.ghc }} in
9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.2.8) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
9.4.5) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
9.6.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
*) GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
esac
echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/crux-mir-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
cabal: ["3.8.1.0"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8", "9.4.5", "9.6.2"]
include:
- os: macos-12
cabal: 3.8.1.0
ghc: 9.2.7
cabal: 3.10.1.0
ghc: 9.2.8

# We want Windows soon, but it doesn't need to be now
name: crux-mir - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
Expand Down Expand Up @@ -129,8 +129,9 @@ jobs:
run: |
GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
case ${{ matrix.ghc }} in
9.2.7) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.4.4) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
9.2.8) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
9.4.5) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
9.6.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-23.05 ;;
*) GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
esac
echo NS="nix shell ${GHC_NIXPKGS}#cabal-install ${GHC_NIXPKGS}#${GHC} nixpkgs#gmp nixpkgs#zlib nixpkgs#zlib.dev" >> $GITHUB_ENV
Expand Down
Loading
Loading