From be1ad35decaea6435712dac90dfc348b75acb88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Tue, 20 Jan 2026 10:28:44 +0100 Subject: [PATCH 1/6] use Rust 2-1-trixie base and OPAM 2.5.0 --- .devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 65ae596527..3391d624b3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/rust:1-1-bookworm +FROM mcr.microsoft.com/devcontainers/rust:2-1-trixie LABEL org.opencontainers.image.authors="Christoph Knittel " LABEL org.opencontainers.image.description="Docker image for ReScript development." @@ -9,5 +9,5 @@ RUN sudo apt-get update && export DEBIAN_FRONTEND=noninteractive \ && rm -rf /var/lib/apt/lists/* # Install OPAM -ARG OPAM_VERSION=2.4.1 +ARG OPAM_VERSION=2.5.0 RUN printf '\n\n' | bash -c "sh <(curl -fsSL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh) --version $OPAM_VERSION" From a399ec8fdc90d9ae282578db4ae8dfae805e32eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Tue, 20 Jan 2026 10:19:12 +0000 Subject: [PATCH 2/6] run `eval $(opam env)` in postcreate shell --- .devcontainer/postCreate.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index c8288d1c83..51da724781 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -9,6 +9,8 @@ opam install . --deps-only --with-test --with-dev-setup -y echo 'eval $(opam env)' >> ~/.zshrc echo 'eval $(opam env)' >> ~/.bashrc +eval $(opam env) + nvm install corepack enable From 54ac5cc69c2c4c1dd5dc0048926b9f77b5861c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Tue, 20 Jan 2026 10:21:56 +0000 Subject: [PATCH 3/6] check that devcontainer can run make --- .github/workflows/ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55632b2338..c6c20467ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -508,6 +508,17 @@ jobs: git commit -m "Update API docs for $GITHUB_REF_NAME" git push + test-devcontainer: + runs-on: ubuntu-24.04-arm + steps: + - name: Checkout + uses: actions/checkout@v6 + - name: Run make in dev container + uses: devcontainers/ci@v0.3 + with: + push: never + runCmd: make + test-installation-npm: needs: - pkg-pr-new From 3dd206b86c1f408922b7dbc76259b84c06ada319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Tue, 20 Jan 2026 10:48:05 +0000 Subject: [PATCH 4/6] install ninja-build for binaryen-bin --- .devcontainer/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3391d624b3..5c2936fe76 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,6 +6,7 @@ RUN sudo apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends \ cmake \ musl-tools \ + ninja-build \ && rm -rf /var/lib/apt/lists/* # Install OPAM From ed32618b6f898f669614b82d1d1ab6342526540a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Tue, 20 Jan 2026 10:48:33 +0000 Subject: [PATCH 5/6] install package too --- .devcontainer/postCreate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 51da724781..9864319c48 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -3,7 +3,7 @@ # Install dev dependencies from OPAM opam init -y --bare --disable-sandboxing opam switch create 5.3.0 -opam install . --deps-only --with-test --with-dev-setup -y +opam install . --with-test --with-dev-setup -y # Add OPAM environment setup to shell startup script echo 'eval $(opam env)' >> ~/.zshrc From bc32032a376fa409107c28e6c0d7c0185ce17698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Tsnobiladz=C3=A9?= Date: Tue, 20 Jan 2026 10:49:17 +0000 Subject: [PATCH 6/6] run opam init with auto-setup --- .devcontainer/postCreate.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 9864319c48..6e2466f1de 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -1,7 +1,7 @@ #!/bin/sh # Install dev dependencies from OPAM -opam init -y --bare --disable-sandboxing +opam init -y --auto-setup --bare --disable-sandboxing opam switch create 5.3.0 opam install . --with-test --with-dev-setup -y @@ -9,8 +9,6 @@ opam install . --with-test --with-dev-setup -y echo 'eval $(opam env)' >> ~/.zshrc echo 'eval $(opam env)' >> ~/.bashrc -eval $(opam env) - nvm install corepack enable