From 6aa04d1b96db51d3974e21ba6e6a76b681629f49 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Fri, 28 Feb 2025 23:48:18 -0600 Subject: [PATCH] feat!: Upgrade to Binaryen v122 --- .github/workflows/opam.yml | 7 ------- binaryen.opam | 2 +- esy.lock/index.json | 13 ++++++------- package.json | 2 +- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index 5cfbb18..1c61e5f 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -37,13 +37,6 @@ jobs: with: ocaml-compiler: ${{ matrix.ocaml-compiler }} - # Necessary until using libbinaryen v122 - - name: Override C Compiler Flags For Windows - if: ${{ startsWith(matrix.os, 'windows-') }} - run: | - echo "CC=x86_64-w64-mingw32-gcc" | Out-File -FilePath $env:GITHUB_ENV -Append - echo "CXX=x86_64-w64-mingw32-g++" | Out-File -FilePath $env:GITHUB_ENV -Append - - name: Install local dependencies run: | opam install . --deps-only --with-test diff --git a/binaryen.opam b/binaryen.opam index cf4a6eb..83e955b 100644 --- a/binaryen.opam +++ b/binaryen.opam @@ -16,6 +16,6 @@ depends: [ "dune" {>= "3.0.0"} "dune-configurator" {>= "3.0.0"} "js_of_ocaml-compiler" {>= "6.0.0" < "7.0.0"} - "libbinaryen" {> "121.0.0" < "122.0.0"} + "libbinaryen" {>= "122.0.1" < "123.0.0"} ] x-maintenance-intent: ["0.(latest)"] diff --git a/esy.lock/index.json b/esy.lock/index.json index e9ec13b..fee0fb3 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "3a14718f627039c7bf5ab17940a38d14", + "checksum": "55b439676e74c57977482d2499504bd2", "root": "@grain/binaryen.ml@link-dev:./package.json", "node": { "ocaml@5.3.0@d41d8cd9": { @@ -1960,14 +1960,14 @@ [ "windows", "x86_64" ] ] }, - "@grain/libbinaryen@121.0.0-b@d41d8cd9": { - "id": "@grain/libbinaryen@121.0.0-b@d41d8cd9", + "@grain/libbinaryen@122.0.0@d41d8cd9": { + "id": "@grain/libbinaryen@122.0.0@d41d8cd9", "name": "@grain/libbinaryen", - "version": "121.0.0-b", + "version": "122.0.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-121.0.0-b.tgz#sha1:0d6f99e9c9f9ed4dd07b3a012ba9c042c13e0783" + "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-122.0.0.tgz#sha1:63c01c799e798e88fbf86c60a5b4b151c062e635" ] }, "overrides": [], @@ -1978,7 +1978,6 @@ "@opam/conf-cmake@github:grain-lang/cmake:esy.json#033cab656dc71a6488b3c1ca6ea45099f794bd03@d41d8cd9" ], "devDependencies": [], - "installConfig": { "pnp": false }, "available": [ [ "darwin", "x86_64" ], [ "darwin", "arm64" ], @@ -2000,7 +1999,7 @@ "ocaml@5.3.0@d41d8cd9", "@opam/dune-configurator@opam:3.20.2@7eb6ff01", "@opam/dune@opam:3.20.2@8daef28d", - "@grain/libbinaryen@121.0.0-b@d41d8cd9" + "@grain/libbinaryen@122.0.0@d41d8cd9" ], "devDependencies": [ "@opam/ocamlformat@opam:0.27.0@c40d4612", diff --git a/package.json b/package.json index 351ea92..12c3c7c 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "dependencies": { "ocaml": ">= 4.13.0 < 5.4.0", - "@grain/libbinaryen": "121.0.0-b", + "@grain/libbinaryen": ">= 122.0.0 < 123.0.0", "@opam/dune": ">= 3.0.0", "@opam/dune-configurator": ">= 3.0.0" },