From d2c8568738ffb0e6c83f97c0cc110efaab5d23ff Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sat, 23 Aug 2025 18:47:07 +0200 Subject: [PATCH 1/2] Fix CHANGELOG --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b5e74f230..2da57e9113 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ #### :bug: Bug fix +- Fix creating interface for functions with upper bounded polymorphic args. https://github.com/rescript-lang/rescript/pull/7786 + #### :memo: Documentation #### :nail_care: Polish @@ -40,7 +42,6 @@ - Fix parse error with nested record types and attributes on the field name that has the nested record type. https://github.com/rescript-lang/rescript/pull/7781 - Fix ppx resolution with package inside monorepo. https://github.com/rescript-lang/rescript/pull/7776 - Fix 'Unbound module type' errors that occurred when trying to async import modules. https://github.com/rescript-lang/rescript/pull/7783 -- Fix creating interface for functions with upper bounded polymorphic args. https://github.com/rescript-lang/rescript/pull/7786 #### :nail_care: Polish From 56426dcaa698804c34ecf1121bc43b502906562b Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Fri, 18 Jul 2025 18:55:18 +0200 Subject: [PATCH 2/2] Build runtime with rewatch on Windows, too --- .github/workflows/ci.yml | 8 +------- CHANGELOG.md | 2 ++ Makefile | 3 --- scripts/buildRuntimeLegacy.sh | 13 ------------- 4 files changed, 3 insertions(+), 23 deletions(-) delete mode 100755 scripts/buildRuntimeLegacy.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75ab39a455..a6cf917bb5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -336,16 +336,10 @@ jobs: run: ./scripts/test_syntax.sh shell: bash - - name: Build runtime/stdlib with rewatch - if: ${{ runner.os != 'Windows' }} + - name: Build runtime/stdlib run: ./scripts/buildRuntime.sh shell: bash - - name: Build runtime/stdlib with bsb (Windows) - if: ${{ runner.os == 'Windows' }} - run: ./scripts/buildRuntimeLegacy.sh - shell: bash - - name: Check for changes in lib folder run: git diff --exit-code lib/js lib/es6 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2da57e9113..dbd129a20a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,8 @@ #### :house: Internal +- Build runtime with rewatch on Windows, too. https://github.com/rescript-lang/rescript/pull/7794 + # 12.0.0-beta.7 #### :rocket: New Feature diff --git a/Makefile b/Makefile index 7bd8b5f95d..e2849cac4a 100644 --- a/Makefile +++ b/Makefile @@ -51,9 +51,6 @@ test-all: test test-gentype test-analysis test-tools test-rewatch reanalyze: reanalyze.exe -set-exit-code -all-cmt _build/default/compiler _build/default/tests -exclude-paths compiler/outcome_printer,compiler/ml,compiler/frontend,compiler/ext,compiler/depends,compiler/core,compiler/common,compiler/cmij,compiler/bsb_helper,compiler/bsb -lib-bsb: - ./scripts/buildRuntimeLegacy.sh - lib: ./scripts/buildRuntime.sh diff --git a/scripts/buildRuntimeLegacy.sh b/scripts/buildRuntimeLegacy.sh deleted file mode 100755 index 1d3c6a541f..0000000000 --- a/scripts/buildRuntimeLegacy.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -e -shopt -s extglob - -(cd runtime && ../cli/rescript-legacy.js clean && ../cli/rescript-legacy.js build) - -rm -f lib/es6/*.js lib/js/*.js lib/ocaml/* -mkdir -p lib/es6 lib/js lib/ocaml - -cp runtime/lib/es6/*.js lib/es6 -cp runtime/lib/js/*.js lib/js -cp runtime/lib/bs/*.@(cmi|cmj|cmt|cmti) lib/ocaml/ -cp runtime/*.@(res|resi) lib/ocaml/