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: Require GHC 9.2 as the minimum #23

Merged
merged 2 commits into from
Jul 29, 2024
Merged

CI: Require GHC 9.2 as the minimum #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fb1342
Bump submodules to allow building with GHC 9.6
RyanGlScott Jul 26, 2024
fa94858
CI: Require GHC 9.2 as the minimum
RyanGlScott Jul 29, 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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ghc-ver: ["8.10.7", "9.2.7", "9.4.4"]
cabal: ["3.8.1.0"]
ghc-ver: ["9.2.8", "9.4.8", "9.6.6"]
cabal: ["3.10.3.0"]
# complete all jobs
fail-fast: false
name: macaw-loader - GHC v${{ matrix.ghc-ver }} - ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: true
- name: Copy cabal project files
run: |
cp cabal.project.dist cabal.project
- uses: haskell/actions/setup@v1
- uses: haskell-actions/setup@v2
id: setup-haskell
name: Setup Haskell
with:
Expand Down
2 changes: 1 addition & 1 deletion submodules/asl-translator
Open in desktop
Submodule asl-translator updated 13 files
+4 −4 .github/workflows/ci-matrix.yml
+4 −5 lib/Data/Parameterized/AssignTree.hs
+3 −4 lib/Data/Parameterized/CtxFuns.hs
+0 −1 lib/Language/ASL/Crucible.hs
+2 −2 lib/Language/ASL/Formulas/Normalize.hs
+0 −1 lib/Language/ASL/StaticExpr.hs
+26 −27 lib/Language/ASL/SyntaxTraverse.hs
+3 −3 lib/Language/ASL/Translation/Driver.hs
+0 −1 lib/Language/ASL/Translation/Preprocess.hs
+3 −1 lib/Util/Log.hs
+1 −2 lib/What4/Expr/ExprTree.hs
+1 −1 submodules/crucible
+1 −1 submodules/what4
2 changes: 1 addition & 1 deletion submodules/crucible
Open in desktop
Submodule crucible updated 3841 files
2 changes: 1 addition & 1 deletion submodules/dwarf
Open in desktop
Submodule dwarf updated 8 files
+2 −2 .github/workflows/ci.yaml
+0 −13 cabal.project.dist.freeze.ghc-8.10.7
+0 −13 cabal.project.dist.freeze.ghc-8.8.4
+0 −13 cabal.project.dist.freeze.ghc-9.0.2
+4 −4 cabal.project.dist.freeze.ghc-9.2.8
+16 −0 cabal.project.dist.freeze.ghc-9.4.5
+16 −0 cabal.project.dist.freeze.ghc-9.6.2
+3 −2 tests/Main.hs
2 changes: 1 addition & 1 deletion submodules/elf-edit
Open in desktop
Submodule elf-edit updated 23 files
+2 −2 .github/workflows/ci.yaml
+0 −97 cabal.project.freeze.ghc-8.10.7
+0 −98 cabal.project.freeze.ghc-8.8.4
+0 −97 cabal.project.freeze.ghc-9.0.2
+42 −44 cabal.project.freeze.ghc-9.2.8
+94 −0 cabal.project.freeze.ghc-9.4.5
+92 −0 cabal.project.freeze.ghc-9.6.2
+3 −1 elf-edit.cabal
+1 −1 src/Data/ElfEdit.hs
+5 −5 src/Data/ElfEdit/HighLevel/GOT.hs
+6 −18 src/Data/ElfEdit/HighLevel/Get.hs
+6 −16 src/Data/ElfEdit/HighLevel/Layout.hs
+1 −7 src/Data/ElfEdit/HighLevel/Types.hs
+6 −0 src/Data/ElfEdit/Prim.hs
+4 −2 src/Data/ElfEdit/Relocations/Android.hs
+279 −0 src/Data/ElfEdit/Relocations/PPC32.hs
+615 −0 src/Data/ElfEdit/Relocations/PPC64.hs
+7 −1 tests/Makefile
+112 −0 tests/Test.hs
+3 −0 tests/ppc32-relocs.c
+ − tests/ppc32-relocs.elf
+3 −0 tests/ppc64-relocs.c
+ − tests/ppc64-relocs.elf
2 changes: 1 addition & 1 deletion submodules/flexdis86
Open in desktop
Submodule flexdis86 updated 18 files
+2 −2 .github/workflows/ci.yaml
+0 −103 cabal.project.ghc-8.10.7.freeze
+43 −45 cabal.project.ghc-9.2.8.freeze
+55 −58 cabal.project.ghc-9.4.5.freeze
+98 −0 cabal.project.ghc-9.6.2.freeze
+78 −58 data/optable.xml
+1 −1 deps/elf-edit
+8 −14 flexdis86.cabal
+2 −0 src/Flexdis86/Assembler.hs
+634 −196 src/Flexdis86/Disassembler.hs
+87 −92 src/Flexdis86/InstructionSet.hs
+14 −3 src/Flexdis86/OpTable.hs
+16 −9 src/Flexdis86/Prefixes.hs
+22 −1 src/Flexdis86/Register.hs
+7 −1 src/Flexdis86/Relocation.hs
+7 −1 src/Flexdis86/Segment.hs
+1 −0 tests/Roundtrip.hs
+3 −2 utils/DumpInstr.hs
2 changes: 1 addition & 1 deletion submodules/llvm-pretty
Open in desktop
Submodule llvm-pretty updated 12 files
+6 −2 .gitignore
+5 −0 CHANGELOG.md
+36 −0 README.md
+13 −6 llvm-pretty.cabal
+3 −6 src/Text/LLVM.hs
+338 −22 src/Text/LLVM/AST.hs
+6 −2 src/Text/LLVM/Labels.hs
+1 −1 src/Text/LLVM/Lens.hs
+316 −215 src/Text/LLVM/PP.hs
+6 −1 test/Main.hs
+343 −0 test/Output.hs
+62 −0 test/TQQDefs.hs
2 changes: 1 addition & 1 deletion submodules/llvm-pretty-bc-parser
Open in desktop
Submodule llvm-pretty-bc-parser updated 80 files
+5 −3 .github/workflows/build.yml
+22 −7 .github/workflows/llvm-quick-fuzz.yml
+68 −0 .github/workflows/nix-ci.yml
+1 −1 .gitmodules
+20 −0 CHANGELOG.md
+8 −4 README.md
+679 −183 disasm-test/Main.hs
+45 −0 disasm-test/README.md
+53 −0 disasm-test/bc_src_tests/README.md
+ − disasm-test/bc_src_tests/apple-llvm.bc
+927 −0 disasm-test/bc_src_tests/apple-llvm.ll
+ − disasm-test/bc_src_tests/hello-world.bc
+4 −0 disasm-test/bc_src_tests/hello-world.ll
+58 −0 disasm-test/known_bugs/README.md
+7 −0 disasm-test/known_bugs/pr247
+1 −1 disasm-test/llvm-tests/README.md
+7 −0 disasm-test/tests/T266-constant-icmp.ll
+7 −0 disasm-test/tests/T266-constant-icmp.pre-llvm15.ll
+10 −0 disasm-test/tests/btf-tag-dicompositetype.ll
+1 −0 disasm-test/tests/btf-tag-dicompositetype.pre-llvm14.ll
+10 −0 disasm-test/tests/btf-tag-diderivedtype.ll
+1 −0 disasm-test/tests/btf-tag-diderivedtype.pre-llvm14.ll
+15 −0 disasm-test/tests/btf-tag-diglobalvariable.ll
+1 −0 disasm-test/tests/btf-tag-diglobalvariable.pre-llvm14.ll
+14 −0 disasm-test/tests/btf-tag-dilocalvariable.ll
+1 −0 disasm-test/tests/btf-tag-dilocalvariable.pre-llvm14.ll
+15 −0 disasm-test/tests/btf-tag-disubprogram.ll
+1 −0 disasm-test/tests/btf-tag-disubprogram.pre-llvm14.ll
+18 −0 disasm-test/tests/callbr.c
+37 −30 disasm-test/tests/callbr.ll
+40 −0 disasm-test/tests/callbr.pre-llvm15.ll
+9 −0 disasm-test/tests/cmpxchg.c
+73 −0 disasm-test/tests/cmpxchg.ll
+5 −0 disasm-test/tests/derivedtype.c
+52 −0 disasm-test/tests/derivedtype.ll
+0 −0 disasm-test/tests/di-arg-list.ll
+1 −0 disasm-test/tests/di-arg-list.pre-llvm13.ll
+4 −0 disasm-test/tests/diderivedtype-address-space.at-least-llvm14.ll
+32 −0 disasm-test/tests/dilocalvariable.ll
+1 −0 disasm-test/tests/dilocalvariable.pre-llvm14.ll
+7 −0 disasm-test/tests/global-var-extern.c
+32 −0 disasm-test/tests/global-var-extern.ll
+7 −0 disasm-test/tests/global-var.c
+13 −0 disasm-test/tests/global-var.ll
+33 −0 disasm-test/tests/instrmd.ll
+4 −0 disasm-test/tests/opaque-atomicrmw.ll
+4 −0 disasm-test/tests/opaque-atomicrmw.pre-llvm15.ll
+11 −0 disasm-test/tests/opaque-call.ll
+4 −0 disasm-test/tests/opaque-call.pre-llvm15.ll
+9 −0 disasm-test/tests/opaque-constant-getelementptr.ll
+4 −0 disasm-test/tests/opaque-constant-getelementptr.pre-llvm15.ll
+8 −0 disasm-test/tests/opaque-getelementptr.ll
+4 −0 disasm-test/tests/opaque-getelementptr.pre-llvm15.ll
+94 −0 disasm-test/tests/p0.c
+533 −0 disasm-test/tests/p0.ll
+0 −0 disasm-test/tests/poison.ll
+1 −0 disasm-test/tests/poison.pre-llvm12.ll
+41 −0 disasm-test/tests/smallprog.c
+226 −0 disasm-test/tests/smallprog.ll
+1 −0 doc/developing.md
+270 −0 flake.lock
+218 −0 flake.nix
+3 −11 fuzzing/Main.hs
+24 −26 llvm-disasm/LLVMDis.hs
+1 −1 llvm-pretty
+32 −13 llvm-pretty-bc-parser.cabal
+25 −32 src/Data/LLVM/BitCode/Assert.hs
+61 −23 src/Data/LLVM/BitCode/IR/Constants.hs
+65 −79 src/Data/LLVM/BitCode/IR/Function.hs
+361 −274 src/Data/LLVM/BitCode/IR/Metadata.hs
+21 −0 src/Data/LLVM/BitCode/IR/Types.hs
+0 −18 src/Data/LLVM/BitCode/IR/Values.hs
+6 −4 src/Data/LLVM/BitCode/Parse.hs
+43 −0 unit-test/Tests/ExpressionInstances.hs
+24 −0 unit-test/Tests/FuncDataInstances.hs
+21 −75 unit-test/Tests/Instances.hs
+2 −1 unit-test/Tests/Metadata.hs
+13 −0 unit-test/Tests/PrimInstances.hs
+15 −0 unit-test/Tests/StmtInstances.hs
+15 −0 unit-test/Tests/TripleInstances.hs
2 changes: 1 addition & 1 deletion submodules/macaw
Open in desktop
Submodule macaw updated 143 files
2 changes: 1 addition & 1 deletion submodules/parameterized-utils
Open in desktop
Submodule parameterized-utils updated 12 files
+17 −4 .github/workflows/test.yml
+13 −1 Changelog.md
+6 −6 parameterized-utils.cabal
+2 −2 src/Data/Parameterized/Context.hs
+3 −2 src/Data/Parameterized/Context/Safe.hs
+2 −1 src/Data/Parameterized/Context/Unsafe.hs
+4 −1 src/Data/Parameterized/DecidableEq.hs
+4 −1 src/Data/Parameterized/Map.hs
+3 −1 src/Data/Parameterized/NatRepr.hs
+3 −0 src/Data/Parameterized/Nonce.hs
+1 −1 test/Test/NatRepr.hs
+3 −5 test/Test/SymbolRepr.hs
2 changes: 1 addition & 1 deletion submodules/semmc
Open in desktop
Submodule semmc updated 16 files
+2 −2 .github/workflows/ci.yml
+3 −3 .gitmodules
+36 −34 cabal.GHC-9.2.8.config
+41 −39 cabal.GHC-9.4.5.config
+59 −59 cabal.GHC-9.6.2.config
+5 −5 semmc-aarch32/src/SemMC/Architecture/ARM/UF.hs
+2 −2 semmc/semmc.cabal
+2 −3 semmc/src/Data/Parameterized/TyMap.hs
+0 −1 semmc/src/Data/Type/List.hs
+5 −4 semmc/src/SemMC/Architecture.hs
+1 −1 semmc/src/SemMC/Architecture/Pseudo.hs
+1 −1 submodules/asl-translator
+1 −1 submodules/crucible
+1 −1 submodules/elf-edit
+1 −1 submodules/llvm-pretty
+1 −1 submodules/what4
2 changes: 1 addition & 1 deletion submodules/what4
Open in desktop
Submodule what4 updated 44 files
+9 −4 .github/workflows/gen_matrix.pl
+24 −0 .github/workflows/lint.yml
+20 −4 .github/workflows/test.yml
+11 −72 .hlint.yaml
+5 −5 README.md
+1 −1 dependencies/aig
+2 −1 what4-abc/src/What4/Solver/ABC.hs
+1 −2 what4-abc/what4-abc.cabal
+1 −1 what4-blt/what4-blt.cabal
+1 −1 what4-transition-system/src/What4/TransitionSystem.hs
+2 −3 what4-transition-system/what4-transition-system.cabal
+43 −0 what4/CHANGES.md
+1 −0 what4/README.md
+2 −2 what4/src/What4/Config.hs
+1 −0 what4/src/What4/Expr.hs
+2 −2 what4/src/What4/Expr/App.hs
+542 −45 what4/src/What4/Expr/Builder.hs
+36 −0 what4/src/What4/Expr/GroundEval.hs
+2 −2 what4/src/What4/Expr/MATLAB.hs
+3 −2 what4/src/What4/Expr/Simplify.hs
+3 −2 what4/src/What4/Expr/VarIdentification.hs
+1 −1 what4/src/What4/Expr/WeightedSum.hs
+46 −5 what4/src/What4/Interface.hs
+1 −1 what4/src/What4/Partial.hs
+61 −7 what4/src/What4/Protocol/SMTLib2.hs
+2 −1 what4/src/What4/Protocol/SMTLib2/Parse.hs
+10 −6 what4/src/What4/Protocol/SMTWriter.hs
+3 −1 what4/src/What4/Protocol/VerilogWriter/AST.hs
+2 −1 what4/src/What4/Protocol/VerilogWriter/Backend.hs
+3 −2 what4/src/What4/Serialize/Parser.hs
+5 −5 what4/src/What4/Serialize/Printer.hs
+11 −0 what4/src/What4/Solver.hs
+158 −0 what4/src/What4/Solver/Bitwuzla.hs
+8 −0 what4/src/What4/Solver/CVC4.hs
+0 −8 what4/src/What4/Solver/CVC5.hs
+88 −9 what4/src/What4/Solver/Z3.hs
+0 −6 what4/src/What4/Utils/Versions.hs
+50 −3 what4/test/AdapterTest.hs
+3 −1 what4/test/ConfigTest.hs
+55 −25 what4/test/ExprBuilderSMTLib2.hs
+4 −3 what4/test/InvariantSynthesis.hs
+3 −0 what4/test/OnlineSolverTest.hs
+3 −1 what4/test/ProbeSolvers.hs
+6 −6 what4/what4.cabal
Loading