This is an automated email from the ASF dual-hosted git repository. jiahuili430 pushed a commit to branch jenkins-set-spidermonkey-128-as-the-default in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 9ba88ddb7ac8029bae0716774f566844cc0d26df Author: Jiahui Li <[email protected]> AuthorDate: Sun May 11 13:32:13 2025 -0500 `SpiderMonkey` 91 is deprecated, use `128` by default File changed: - CI - `configure` script - Documentation --- build-aux/Jenkinsfile.full | 4 ++-- configure | 2 +- configure.ps1 | 6 +++--- src/couch/rebar.config.script | 4 ++-- src/couch_dist/README.md | 8 ++++---- src/docs/src/best-practices/jsdevel.rst | 8 ++++---- src/docs/src/install/unix.rst | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full index 1b770bae1..99299a258 100644 --- a/build-aux/Jenkinsfile.full +++ b/build-aux/Jenkinsfile.full @@ -49,7 +49,7 @@ meta = [ 'jammy': [ name: 'Ubuntu 22.04', - spidermonkey_vsn: '91', + spidermonkey_vsn: '128', with_nouveau: true, with_clouseau: true, image: "apache/couchdbci-ubuntu:jammy-erlang-${ERLANG_VERSION}" @@ -106,7 +106,7 @@ meta = [ 'freebsd-x86_64': [ name: 'FreeBSD x86_64', - spidermonkey_vsn: '91', + spidermonkey_vsn: '128', with_clouseau: true, clouseau_java_home: '/usr/local/openjdk8-jre', gnu_make: 'gmake' diff --git a/configure b/configure index 70350a07b..5370e7cee 100755 --- a/configure +++ b/configure @@ -40,7 +40,7 @@ run_erlang() { COUCHDB_USER="$(whoami 2>/dev/null || echo couchdb)" JS_ENGINE=${JS_ENGINE:-"spidermonkey"} -SM_VSN=${SM_VSN:-"91"} +SM_VSN=${SM_VSN:-"128"} CLOUSEAU_MTH=${CLOUSEAU_MTH:-"dist"} CLOUSEAU_URI=${CLOUSEAU_URI:-"https://github.com/cloudant-labs/clouseau/releases/download/%s/clouseau-%s-dist.zip"} CLOUSEAU_VSN=${CLOUSEAU_VSN:-"2.23.1"} diff --git a/configure.ps1 b/configure.ps1 index faf3669ec..d3c96a3f7 100644 --- a/configure.ps1 +++ b/configure.ps1 @@ -8,11 +8,11 @@ -DisableFauxton request build process skip building Fauxton (default false) -DisableDocs request build process skip building documentation (default false) -DisableSpiderMonkey do not use SpiderMonkey as JS engine (default false) - -WithNouveau build the new experiemtal search module (default false) + -WithNouveau build the new experimental search module (default false) -WithClouseau build the Clouseau search module (default false) -SkipDeps do not update Erlang dependencies (default false) -CouchDBUser USER set the username to run as (defaults to current user) - -SpiderMonkeyVersion VSN select the version of SpiderMonkey to use (default 91) + -SpiderMonkeyVersion VSN select the version of SpiderMonkey to use (default 128) -JSEngine ENGINE select JS engine to use (spidermonkey or quickjs) (default spidermonkey) -ClouseauVersion VSN select the version of Clouseau to use (default 2.23.1) -ClouseauMethod MTH method for Clouseau to deploy: git or dist (default dist) @@ -60,7 +60,7 @@ Param( [ValidateNotNullOrEmpty()] [string]$CouchDBUser = [Environment]::UserName, # set the username to run as (defaults to current user) [ValidateNotNullOrEmpty()] - [string]$SpiderMonkeyVersion = "91", # select the version of SpiderMonkey to use (default 91) + [string]$SpiderMonkeyVersion = "128", # select the version of SpiderMonkey to use (default 128) [ValidateNotNullOrEmpty()] [string]$JSEngine = "spidermonkey", # select the JS engine (spidermonkey | quickjs) to use (default spidermonkey) [ValidateNotNullOrEmpty()] diff --git a/src/couch/rebar.config.script b/src/couch/rebar.config.script index c4e0b7a7e..0216c38c9 100644 --- a/src/couch/rebar.config.script +++ b/src/couch/rebar.config.script @@ -98,12 +98,12 @@ SMVsn = case lists:keyfind(spidermonkey_version, 1, CouchConfig) of {_, "128"} -> "128"; undefined -> - "91"; + "128"; {_, Unsupported} -> io:format(standard_error, "Unsupported SpiderMonkey version: ~s~n", [Unsupported]), erlang:halt(1); false -> - "91" + "128" end. ConfigH = [ diff --git a/src/couch_dist/README.md b/src/couch_dist/README.md index aabf4a5d9..881992361 100644 --- a/src/couch_dist/README.md +++ b/src/couch_dist/README.md @@ -96,8 +96,8 @@ You can run CouchDB with `--enable-tls` mode, which will automatically generate vm.args, certificates, and configuration files. ```bash -./configure --dev --spidermonkey-version 91 && make && ./dev/run -t -./configure --dev --spidermonkey-version 91 && make && ./dev/run --enable-tls +./configure --dev --disable-spidermonkey && make && ./dev/run -t +./configure --dev --disable-spidermonkey && make && ./dev/run --enable-tls ./dev/remsh-tls ([email protected])1> net_kernel:nodes_info(). @@ -130,8 +130,8 @@ vm.args, certificates, and configuration files. You can also set specific nodes to use TCP: ```bash -./configure --dev --spidermonkey-version 91 && make && ./dev/run -t --no-tls [email protected] -./configure --dev --spidermonkey-version 91 && make && ./dev/run -t --no-tls node2,node3 +./configure --dev --disable-spidermonkey && make && ./dev/run -t --no-tls [email protected] +./configure --dev --disable-spidermonkey && make && ./dev/run -t --no-tls node2,node3 ./dev/remsh-tls ([email protected])1> net_kernel:nodes_info(). diff --git a/src/docs/src/best-practices/jsdevel.rst b/src/docs/src/best-practices/jsdevel.rst index e4394e041..249f466fa 100644 --- a/src/docs/src/best-practices/jsdevel.rst +++ b/src/docs/src/best-practices/jsdevel.rst @@ -71,10 +71,10 @@ SpiderMonkey version compatibility Depending on the CouchDB version and what's available on supported operating systems, the SpiderMonkey version may be any one of these: 1.8.5, 60, 68, 78, -86 or 91. Sometimes there are differences in supported features between -versions. Usually later versions only add features, so views will work on -version upgrades. However, there are a few exceptions to this. These are a few -known regression or discrepancies between versions: +86, 91, 120, 115, or 128. Sometimes there are differences in supported features +between versions. Usually later versions only add features, so views will work +on version upgrades. However, there are a few exceptions to this. These are a +few known regression or discrepancies between versions: 1. ``for each (var x in ...)`` diff --git a/src/docs/src/install/unix.rst b/src/docs/src/install/unix.rst index 0d60ec52d..8227b55a4 100644 --- a/src/docs/src/install/unix.rst +++ b/src/docs/src/install/unix.rst @@ -210,7 +210,7 @@ Fedora 36 On Fedora 36, you may need these packages in addition to the ones listed above: -* `mozjs91-devel` +* `mozjs128-devel` * `erlang-rebar` If the system contains dangling links to Erlang chunk files, the compiler will @@ -230,7 +230,7 @@ Note that due to a problem with the Python package sphinx-build, it is not possible to compile the documentation on Fedora 36. You can skip compiling the documentation via:: - ./configure --disable-docs --spidermonkey-version 91 + ./configure --disable-docs --spidermonkey-version 128 Mac OS X --------
