Skip to content

Commit 635c978

Browse files
committed
[WIP] Fix CI.
1 parent b9e7286 commit 635c978

File tree

4 files changed

+37
-19
lines changed

4 files changed

+37
-19
lines changed

.github/workflows/haskell-ci.yaml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,27 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [ubuntu-20.04, macos-latest]
21+
os: [ubuntu-latest, macos-latest]
2222
include:
2323
- os: macos-latest
24-
install_deps: brew install llvm@15 pkg-config wget gzip coreutils
25-
path_extension: $(brew --prefix llvm@15)/bin
26-
- os: ubuntu-20.04
27-
install_deps: deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main; deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main; sudo apt-get install llvm-15-tools llvm-15-dev pkg-config wget gzip wamerican
28-
path_extension: /usr/lib/llvm-15/bin
24+
install_deps: |
25+
brew install llvm@15 pkg-config wget gzip coreutils
26+
mkdir -p $HOME/.local/bin
27+
ln -s $(brew --prefix llvm@15)/bin/llvm-config $HOME/.local/bin/llvm-config-15
28+
ln -s $(brew --prefix llvm@15)/bin/llvm-config $HOME/.local/bin/
29+
ln -s $(brew --prefix llvm@15)/bin/clang++ $HOME/.local/bin/
30+
echo "$HOME/.local/bin" >> $GITHUB_PATH
31+
# path_extension: $(brew --prefix llvm@15)/bin
32+
33+
- os: ubuntu-latest
34+
install_deps: |
35+
curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
36+
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
37+
sudo apt-get update
38+
sudo apt-get -y install clang-15 llvm-15-dev llvm-15-tools
39+
sudo apt-get -y install pkg-config wget gzip wamerican
40+
echo "/usr/lib/llvm-15/bin" >> $GITHUB_PATH
41+
# path_extension: /usr/lib/llvm-15/bin
2942

3043
steps:
3144
- name: Checkout the repository
@@ -36,7 +49,7 @@ jobs:
3649
with:
3750
path: |
3851
~/.stack
39-
~/.ghcup/ghc/9.2.6
52+
~/.ghcup/ghc/9.2.7
4053
$GITHUB_WORKSPACE/.stack-work
4154
$GITHUB_WORKSPACE/.stack-work-test
4255
$GITHUB_WORKSPACE/examples/t10k-images-idx3-ubyte
@@ -48,8 +61,8 @@ jobs:
4861
- name: Install system dependencies
4962
run: |
5063
${{ matrix.install_deps }}
51-
if [[ "$OSTYPE" == "darwin"* ]]; then ghcup install ghc 9.2.6; fi
52-
echo "${{ matrix.path_extension }}" >> $GITHUB_PATH
64+
if [[ "$OSTYPE" == "darwin"* ]]; then ghcup install ghc 9.2.7; fi
65+
# echo "${{ matrix.path_extension }}" >> $GITHUB_PATH
5366
5467
# This step is a workaround.
5568
# See issue for context: https://github.com/actions/cache/issues/445

.github/workflows/python-ci.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,16 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [ubuntu-20.04]
21+
os: [ubuntu-latest]
2222
include:
23-
- os: ubuntu-20.04
24-
install_deps: sudo apt-get install llvm-12-tools llvm-12-dev pkg-config wget gzip
25-
path_extension: /usr/lib/llvm-12/bin
23+
- os: ubuntu-latest
24+
install_deps: |
25+
curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
26+
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
27+
sudo apt-get update
28+
sudo apt-get -y install clang-15 llvm-15-dev llvm-15-tools
29+
sudo apt-get -y install pkg-config wget gzip wamerican
30+
path_extension: /usr/lib/llvm-15/bin
2631

2732
steps:
2833
- name: Checkout the repository

makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ build-ffis-and-exe: dexrt-llvm
198198
cp $(STACK_INSTALL_DIR)/lib/libDex.so julia/deps/
199199

200200
build-ci: dexrt-llvm
201-
$(STACK) build $(STACK_FLAGS) --force-dirty --ghc-options "-Werror -fforce-recomp"
201+
$(STACK) build $(STACK_FLAGS) --force-dirty --ghc-options "-Werror -fforce-recomp -Wno-incomplete-uni-patterns"
202202
$(dex) clean # clear cache
203203
$(dex) script /dev/null # precompile the prelude
204204

stack.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ extra-deps:
1616
subdirs:
1717
- llvm-hs
1818
- llvm-hs-pure
19-
- megaparsec-8.0.0
19+
- megaparsec-9.2.2
2020
- prettyprinter-1.6.2
21-
- store-0.7.8@sha256:0b604101fd5053b6d7d56a4ef4c2addf97f4e08fe8cd06b87ef86f958afef3ae,8001
22-
- store-core-0.4.4.4@sha256:a19098ca8419ea4f6f387790e942a7a5d0acf62fe1beff7662f098cfb611334c,1430
23-
- th-utilities-0.2.4.1@sha256:b37d23c8bdabd678aee5a36dd4373049d4179e9a85f34eb437e9cd3f04f435ca,1869
21+
# - store-0.7.8@sha256:0b604101fd5053b6d7d56a4ef4c2addf97f4e08fe8cd06b87ef86f958afef3ae,8001
22+
# - store-core-0.4.4.4@sha256:a19098ca8419ea4f6f387790e942a7a5d0acf62fe1beff7662f098cfb611334c,1430
23+
# - th-utilities-0.2.4.1@sha256:b37d23c8bdabd678aee5a36dd4373049d4179e9a85f34eb437e9cd3f04f435ca,1869
2424

2525
nix:
2626
enable: false
27-
packages: [ libpng llvm_12 pkg-config zlib ]
27+
packages: [ libpng llvm_15 pkg-config zlib ]
2828

2929
ghc-options:
3030
containers: -fno-prof-auto -O2

0 commit comments

Comments
 (0)