From 950bd2d8558e8ed7c135ce50db7e3626cd160ae2 Mon Sep 17 00:00:00 2001 From: "David P. Caldwell" Date: Sat, 28 Feb 2026 18:34:22 -0500 Subject: [PATCH 1/3] #2239: First pass at updating to Rhino 1.9.1; pushing to test in CI --- contributor/dependencies/module.js | 11 ++++++++--- rhino/jrunscript/api.js | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/contributor/dependencies/module.js b/contributor/dependencies/module.js index 6d0e2dce4..f2823afee 100644 --- a/contributor/dependencies/module.js +++ b/contributor/dependencies/module.js @@ -31,15 +31,16 @@ id: "mozilla/1.7.15" }; } else { + // TODO Also in rhino/jrunscript/api.js; is there a DRYer solution? return { - number: "1.8.0", - id: "mozilla/1.8.0" + number: "1.9.1", + id: "mozilla/1.9.1" }; } }, versions: { jdk8: "1.7.15", - default: "1.8.0" + default: "1.9.1" }, sources: { "mozilla/1.7.13": { @@ -57,6 +58,10 @@ "mozilla/1.8.0": { url: "https://repo1.maven.org/maven2/org/mozilla/rhino-all/1.8.0/rhino-all-1.8.0.jar", format: "jar" + }, + "mozilla/1.9.1": { + url: "https://repo1.maven.org/maven2/org/mozilla/rhino-all/1.9.1/rhino-all-1.9.1.jar", + format: "jar" } } }, diff --git a/rhino/jrunscript/api.js b/rhino/jrunscript/api.js index f7652f474..7e072863f 100644 --- a/rhino/jrunscript/api.js +++ b/rhino/jrunscript/api.js @@ -1930,8 +1930,8 @@ ); } return SingleJarDownload( - "1.8.0", - "https://repo1.maven.org/maven2/org/mozilla/rhino-all/1.8.0/rhino-all-1.8.0.jar", + "1.9.1", + "https://repo1.maven.org/maven2/org/mozilla/rhino-all/1.9.1/rhino-all-1.9.1.jar", "js" ); }; From 7a503d060fd7ae0ac428ad5ff1833ebb40da7235 Mon Sep 17 00:00:00 2001 From: "David P. Caldwell" Date: Sat, 28 Feb 2026 18:45:17 -0500 Subject: [PATCH 2/3] Try to fix macOS regression that may stem from workspace trust --- .github/workflows/macos.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml index 5a8c88d5a..f7835e73c 100644 --- a/.github/workflows/macos.yaml +++ b/.github/workflows/macos.yaml @@ -19,6 +19,8 @@ jobs: steps: - name: Check out repository code uses: actions/checkout@v2 + - name: Trust the workspace + run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Run the linting and the tests env: SLIME_WF_SKIP_GIT_IDENTITY_REQUIREMENT: 1 From e5c6e872577f3a2f758bb4a1a8e8120c66425637 Mon Sep 17 00:00:00 2001 From: "David P. Caldwell" Date: Sun, 1 Mar 2026 07:36:20 -0500 Subject: [PATCH 3/3] #2239: Remove change that was likely not the problem --- .github/workflows/macos.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml index f7835e73c..5a8c88d5a 100644 --- a/.github/workflows/macos.yaml +++ b/.github/workflows/macos.yaml @@ -19,8 +19,6 @@ jobs: steps: - name: Check out repository code uses: actions/checkout@v2 - - name: Trust the workspace - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Run the linting and the tests env: SLIME_WF_SKIP_GIT_IDENTITY_REQUIREMENT: 1