Skip to content

Commit f9c1008

Browse files
Merge master to include the Windows watch-test race fix
Bring in #8902, which waits for duplicate change events to settle before asserting that an unrelated edit retries a failed parse. Keep the reviewed watcher recovery changes and their regressions intact, alongside the merged cleanup and playground API compatibility changes. Validation: Native compiler/CLI and Rust builds, 150 Rust unit tests, Clippy with warnings denied, Rust formatting, canonical suite coverage, changelog, shell syntax, and whitespace checks pass. 47 of 48 OCaml build-system unit cases pass; the native watcher case hits the local filesystem-event EMFILE limit and remains for CI. The retained-parse test matches master exactly. Signed-off-by: Florian Hammerschmidt <florianh89@gmail.com>
2 parents 300110c + 6a3eed1 commit f9c1008

248 files changed

Lines changed: 8082 additions & 5593 deletions

File tree

Some content is hidden

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

‎.claude/skills/records/SKILL.md‎

Lines changed: 169 additions & 120 deletions
Large diffs are not rendered by default.

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN sudo apt-get update && export DEBIAN_FRONTEND=noninteractive \
1111
&& rm -rf /var/lib/apt/lists/*
1212

1313
# Install OPAM
14-
ARG OPAM_VERSION=2.5.0
14+
ARG OPAM_VERSION=2.6.1
1515
RUN printf '\n\n' | bash -c "sh <(curl -fsSL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh) --version $OPAM_VERSION"
1616

1717
USER vscode

‎.github/actions/setup-linux-dependencies/action.yml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,27 @@ runs:
2323
read -ra packages <<< "$PACKAGES"
2424
mapfile -t packages < <(printf '%s\n' "${packages[@]}" | sort -u)
2525
26+
candidate() {
27+
local output
28+
output="$(apt-cache policy "$1" 2>&1)" || {
29+
echo "apt-cache policy $1 failed with exit code $?:" >&2
30+
printf '%s\n' "$output" >&2
31+
return 1
32+
}
33+
awk '/Candidate:/ { print $2; exit }' <<< "$output"
34+
}
35+
36+
# A runner image may ship without package lists, in which case no
37+
# candidate resolves until the lists are fetched.
38+
updated=false
2639
resolved_packages=()
2740
for package in "${packages[@]}"; do
28-
version="$(apt-cache policy "$package" | awk '/Candidate:/ { print $2; exit }')"
41+
version="$(candidate "$package")" || version=""
42+
if [[ ( -z "$version" || "$version" == "(none)" ) && "$updated" == false ]]; then
43+
sudo apt-get update
44+
updated=true
45+
version="$(candidate "$package")" || version=""
46+
fi
2947
if [[ -z "$version" || "$version" == "(none)" ]]; then
3048
echo "Unable to resolve an APT candidate for $package" >&2
3149
exit 1

‎.github/actions/setup-node/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
using: composite
66
steps:
77
- name: Use Node.js
8-
uses: actions/setup-node@v6
8+
uses: actions/setup-node@v7
99
with:
1010
cache: yarn
1111
node-version-file: .nvmrc

‎.github/actions/setup-ocaml/action.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,20 @@ runs:
3030
if: runner.os != 'Windows'
3131
shell: bash
3232
env:
33-
BINARYEN_VERSION: "131"
33+
BINARYEN_VERSION: "133"
3434
run: |
3535
case "$RUNNER_OS-$RUNNER_ARCH" in
3636
Linux-X64)
3737
platform=x86_64-linux
38-
checksum=b5bf1f0eaf17c63ee588ff7a5954dc8f6ce2c26989051c66f24dfe9ece3e46db
38+
checksum=2dc9c7813f5375db93d96ead4b78222fcc3e2677bbb832297af4797782a37489
3939
;;
4040
Linux-ARM64)
4141
platform=aarch64-linux
42-
checksum=ba991f677edd9a21d2bc96c0144bc8ac5b112d4d98a3eb266e075e22e557df2a
43-
;;
44-
macOS-X64)
45-
platform=x86_64-macos
46-
checksum=d209fadd8a894bdaf3bd3612a23c32a0af184d2f4a979b8c789e6e4f6a4de883
42+
checksum=89c07ea56faf38d0fbecf36ca8ec0721756716185f265b568e133d427f299bf8
4743
;;
4844
macOS-ARM64)
4945
platform=arm64-macos
50-
checksum=e441b48dc22163d209b4f05e44dc7210909b01237642b6c9ae48fd710a3ef83e
46+
checksum=ad66da82ac13f163e424b1643f16c6dfcccc98b5966296b43e52d3cab04f84a8
5147
;;
5248
*)
5349
echo "Unsupported Binaryen platform: $RUNNER_OS-$RUNNER_ARCH" >&2
@@ -79,10 +75,12 @@ runs:
7975
COMPILER: ${{ inputs.compiler }}
8076
DEPENDENCY_FLAGS: ${{ inputs.dependency-flags }}
8177
OS: ${{ inputs.os }}
78+
# 3.9.0 is the ocaml/setup-ocaml version below. Update both together:
79+
# Dependabot bumps only the `uses:` line, and a cache hit skips that step.
8280
run: |
8381
dependency_flags_key="${DEPENDENCY_FLAGS//--/}"
8482
dependency_flags_key="${dependency_flags_key// /_}"
85-
dependency_hash="${{ hashFiles('*.opam', '.github/opam-repository/repo', '.github/opam-repository/packages/**') }}"
83+
dependency_hash="${{ hashFiles('*.opam') }}"
8684
key="$CACHE_PREFIX-$OS-3.9.0-$COMPILER-$dependency_flags_key-$dependency_hash"
8785
echo "value=${key//,/-}" >> "$GITHUB_OUTPUT"
8886
echo "setup-version=3.9.0" >> "$GITHUB_OUTPUT"
@@ -131,7 +129,6 @@ runs:
131129
env:
132130
DEPENDENCY_FLAGS: ${{ inputs.dependency-flags }}
133131
run: |
134-
opam repository add rescript-overrides "$GITHUB_WORKSPACE/.github/opam-repository"
135132
read -ra dependency_flags <<< "$DEPENDENCY_FLAGS"
136133
if [[ "$RUNNER_OS" == "Windows" ]]; then
137134
export AR=x86_64-w64-mingw32-ar

‎.github/dependabot.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ updates:
66
schedule:
77
interval: "weekly"
88

9-
# Manage GitHub Actions dependencies
9+
# Manage GitHub Actions dependencies in the workflows and in the composite
10+
# actions under .github/actions
1011
- package-ecosystem: "github-actions"
11-
directory: "/"
12+
directories:
13+
- "/"
14+
- "/.github/actions/*"
1215
schedule:
1316
interval: "weekly"

‎.github/opam-repository/README.md‎

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

‎.github/opam-repository/packages/luv/luv.0.5.14/files/arm64-musl-outline-atomics.patch‎

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

‎.github/opam-repository/packages/luv/luv.0.5.14/opam‎

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

‎.github/opam-repository/repo‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)