Skip to content

Commit 10c55ff

Browse files
committed
Merge remote-tracking branch 'origin/master' into phadej-hide-internal
2 parents b06f578 + 904bdad commit 10c55ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+748
-514
lines changed

.devcontainer/Dockerfile

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
FROM mcr.microsoft.com/devcontainers/base:bookworm
2+
3+
# update Debian
4+
ENV DEBIAN_FRONTEND=noninteractive
5+
RUN apt-get update && apt-get -y dist-upgrade
6+
7+
# user
8+
USER vscode
9+
WORKDIR /home/vscode
10+
ENV LC_ALL=en_US.utf-8
11+
12+
# ghcup
13+
ARG BOOTSTRAP_HASKELL_NONINTERACTIVE=1
14+
ARG BOOTSTRAP_HASKELL_MINIMAL=1
15+
RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
16+
ENV PATH=/home/vscode/.ghcup/bin:$PATH
17+
18+
# cabal
19+
RUN ghcup install cabal --set latest
20+
RUN cabal update
21+
ENV PATH=/home/vscode/.cabal/bin:$PATH
22+
23+
# native back-end
24+
ENV GHC_NATIVE_VERSIONS="9.8.4 9.10.1 9.12.2"
25+
ENV GHC_NATIVE_EXPIRED_VERSIONS="9.4.8 9.6.7"
26+
WORKDIR /home/vscode
27+
RUN for V in $GHC_NATIVE_VERSIONS $GHC_NATIVE_EXPIRED_VERSIONS; do ghcup install ghc $V; done
28+
RUN sudo apt-get install -y libgmp-dev
29+
30+
# formatter
31+
WORKDIR /home/vscode
32+
RUN ghcup set ghc 9.12.2
33+
RUN cabal install fourmolu-0.18.0.0
34+
35+
# WebAssembly back-end
36+
ENV GHC_WASM32_VERSIONS="wasm32-wasi-9.8.4.20250206 wasm32-wasi-9.10.1.20250327 wasm32-wasi-9.12.2.20250327"
37+
WORKDIR /home/vscode
38+
RUN sudo apt-get install -y zstd
39+
RUN curl https://gitlab.haskell.org/haskell-wasm/ghc-wasm-meta/-/raw/master/bootstrap.sh | SKIP_GHC=1 sh
40+
RUN ghcup config add-release-channel https://gitlab.haskell.org/haskell-wasm/ghc-wasm-meta/-/raw/master/ghcup-wasm-0.0.9.yaml
41+
RUN . /home/vscode/.ghc-wasm/env && for V in $GHC_WASM32_VERSIONS; do ghcup install ghc $V -- $CONFIGURE_ARGS; done
42+
RUN curl -LO https://github.com/bytecodealliance/wasmtime/releases/download/dev/wasmtime-dev-x86_64-linux.tar.xz
43+
RUN xz -d wasmtime-dev-x86_64-linux.tar.xz
44+
RUN tar xvf wasmtime-dev-x86_64-linux.tar
45+
ENV PATH=/home/vscode/wasmtime-dev-x86_64-linux:$PATH
46+
47+
# JavaScript back-end
48+
ENV GHC_JS_VERSIONS="javascript-unknown-ghcjs-9.10.0.20240413 javascript-unknown-ghcjs-9.12.1"
49+
WORKDIR /home/vscode
50+
RUN sudo apt-get install -y nodejs
51+
RUN ghcup config add-release-channel cross
52+
RUN git clone https://github.com/emscripten-core/emsdk.git
53+
WORKDIR /home/vscode/emsdk
54+
RUN sudo apt-get install -y python3
55+
RUN ./emsdk install 3.1.57
56+
RUN ./emsdk activate 3.1.57
57+
RUN . ./emsdk_env.sh && emconfigure ghcup install ghc javascript-unknown-ghcjs-9.10.0.20240413
58+
RUN ./emsdk install 3.1.74
59+
RUN ./emsdk activate 3.1.74
60+
RUN . ./emsdk_env.sh && emconfigure ghcup install ghc javascript-unknown-ghcjs-9.12.1
61+
62+
# MicroHs back-end
63+
WORKDIR /home/vscode
64+
RUN git clone https://github.com/augustss/MicroHs.git --branch stable-7 mhs
65+
WORKDIR /home/vscode/mhs
66+
RUN make minstall
67+
ENV PATH=/home/vscode/.mcabal/bin:$PATH
68+
69+
# build commands
70+
WORKDIR /home/vscode
71+
RUN sudo apt-get install -y autoconf
72+
ENV PATH=/workspaces/time/bin:$PATH
73+
ENV TZ="America/Los_Angeles"

.devcontainer/devcontainer.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/debian
3+
{
4+
"name": "Builder",
5+
"build":
6+
{
7+
"dockerfile": "Dockerfile"
8+
}
9+
}

.envrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use nix -p devcontainer just act docker

.github/workflows/ci.mhs.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

.github/workflows/ci.wasm32.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)