Skip to content

chore: sync fork with upstream (conflicts resolved)#31

Merged
yosefAlsuhaibani merged 116 commits into
masterfrom
yosef/sync-fork-3
Jun 16, 2026
Merged

chore: sync fork with upstream (conflicts resolved)#31
yosefAlsuhaibani merged 116 commits into
masterfrom
yosef/sync-fork-3

Conversation

@yosefAlsuhaibani

Copy link
Copy Markdown

Resolves the merge conflicts blocking the fork sync in #30 (which is ocaml:mastermaster and cannot be updated directly since its head is upstream's branch). This branch merges upstream/master into the fork with conflicts resolved.

Fork customizations preserved

  • opam pinned to 2.5.0 (>=2.5.0 < 2.5.1) — see OPAM_STABLE_VERSION_RANGE in opam.ts. Upstream uses <2.6.0; flagging in case the pin is no longer needed.
  • opam internal Cygwin with extra packages (--cygwin-extra-packages), now scoped to the cygwin windows-environment
  • save-opam-post-run input + post-step opam cache save
  • Alpine/apk support (DISTRO detection)
  • Unconditional opam repository re-sync (even on cache hit)
  • "v2" cache-key suffix and the cache-prefix input (upstream removed cache-prefix; kept since the fork still uses it)

Upstream changes adopted

  • Vite Plus build replacing Turborepo/Biome/esbuild — dist/ is now *.mjs (regenerated)
  • MSYS2 + MSVC Windows support (windows-environment, windows-compiler inputs)
  • opam binary fallback (converges with the fork's "skip releases without binaries")
  • Dependency and tooling updates

Validation

  • yarn typecheck — passes (5 packages)
  • yarn lint — 0 errors, 0 warnings, formatting clean
  • yarn build — succeeds, dist/ regenerated and confirmed to embed all fork features

Once merged, #30 can be closed.

🤖 Generated with Claude Code

dependabot Bot and others added 30 commits December 8, 2025 02:03
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.6 to 4.31.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@fe4161a...cf1bb45)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@1af3b93...8e8c483)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…tions/checkout-6.0.1

Bump actions/checkout from 6.0.0 to 6.0.1
…thub/codeql-action-4.31.7

Bump github/codeql-action from 4.31.6 to 4.31.7
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.7 to 4.31.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@cf1bb45...1b168cd)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Sora Morimoto <sora@morimoto.io>
Signed-off-by: Sora Morimoto <sora@morimoto.io>
Signed-off-by: Sora Morimoto <sora@morimoto.io>
Signed-off-by: Sora Morimoto <sora@morimoto.io>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.8 to 4.31.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@1b168cd...5d4e8d1)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Sora Morimoto <sora@morimoto.io>
…thub/codeql-action-4.31.9

Bump github/codeql-action from 4.31.8 to 4.31.9
Signed-off-by: Sora Morimoto <sora@morimoto.io>
Bumps [jdx/mise-action](https://github.com/jdx/mise-action) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/jdx/mise-action/releases)
- [Changelog](https://github.com/jdx/mise-action/blob/main/CHANGELOG.md)
- [Commits](jdx/mise-action@146a281...c53b923)

---
updated-dependencies:
- dependency-name: jdx/mise-action
  dependency-version: 3.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.9 to 4.31.10.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@5d4e8d1...cdefb33)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.10 to 4.31.11.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@cdefb33...19b2f06)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [jdx/mise-action](https://github.com/jdx/mise-action) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/jdx/mise-action/releases)
- [Changelog](https://github.com/jdx/mise-action/blob/main/CHANGELOG.md)
- [Commits](jdx/mise-action@c53b923...6d1e696)

---
updated-dependencies:
- dependency-name: jdx/mise-action
  dependency-version: 3.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@8e8c483...de0fac2)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.11 to 4.32.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@19b2f06...b20883b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.32.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.32.0 to 4.32.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@b20883b...45cbd0c)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.32.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.32.2 to 4.32.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@45cbd0c...9e907b5)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.32.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
smorimoto and others added 19 commits March 29, 2026 01:54
The descriptions for lint-doc, lint-fmt, analysis, and lint-opam were
too brief to be useful. Replace them with accurate, specific
descriptions that explain which tools each action runs and how it
behaves, matching the level of detail already present in the main
action.yml.
Improve action descriptions for sub-actions
When using --cygwin-internal-install, opam automatically installs make,
tar, unzip, and rsync into its internal Cygwin (see
required_packages_for_cygwin in opamInitDefaults.ml). The MSYS2
environment uses --cygwin-location instead, so opam does not manage
package installation — these must be pre-installed.

Previously only mingw-w64-x86_64-gcc was installed for mingw builds.
This caused CPAN module builds (and potentially other depext-driven
builds) to fail because the MSYS2 make was missing, falling back to
the mingw make which cannot handle POSIX paths.

Move the MSYS2 package installation into system-packages.ts alongside
the existing Unix system package helpers, and install the full set of
base packages for all compiler variants (not just mingw).

Closes ocaml#1094
…inaries

Fall back to an older opam release when the latest lacks binaries
Signed-off-by: Sora Morimoto <sora@morimoto.io>
Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@de0fac2...df4cb1c)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [jdx/mise-action](https://github.com/jdx/mise-action) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/jdx/mise-action/releases)
- [Changelog](https://github.com/jdx/mise-action/blob/main/CHANGELOG.md)
- [Commits](jdx/mise-action@1648a78...dba1968)

---
updated-dependencies:
- dependency-name: jdx/mise-action
  dependency-version: 4.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…x/mise-action-4.1.0

Bump jdx/mise-action from 4.0.1 to 4.1.0
…tions/checkout-6.0.3

Bump actions/checkout from 6.0.2 to 6.0.3
Resolves conflicts from syncing ocaml/setup-ocaml master into the
semgrep fork. Preserves fork customizations:
- opam pinned to 2.5.0 (>=2.5.0 < 2.5.1)
- opam internal Cygwin with extra packages (--cygwin-extra-packages)
- save-opam-post-run input + post-step opam cache save
- alpine/apk support (DISTRO detection)
- unconditional opam repository re-sync on cache hit
- "v2" cache-key suffix and cache-prefix input

Adopts upstream changes: Vite Plus build (replaces Turborepo/Biome/
esbuild, dist now *.mjs), MSYS2 + MSVC Windows support, opam binary
fallback, and updated dependencies. dist/ regenerated; typecheck and
lint pass.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@CLAassistant

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ yosefAlsuhaibani
❌ smorimoto
You have signed the CLA already but the status is still pending? Let us recheck it.

1 similar comment
@CLAassistant

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ yosefAlsuhaibani
❌ smorimoto
You have signed the CLA already but the status is still pending? Let us recheck it.

Comment thread yarn.lock

yosefAlsuhaibani commented Jun 16, 2026

Copy link
Copy Markdown
Author

@yosefAlsuhaibani yosefAlsuhaibani merged commit 926350d into master Jun 16, 2026
30 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants