[gjs/mozjs91: 1/25] meson: Update mozjs to mozjs-91




commit e3c9804d767166a6c11ecffe949fb3b0fb00fd9b
Author: Evan Welsh <contact evanwelsh com>
Date:   Sat Jul 10 20:31:49 2021 -0700

    meson: Update mozjs to mozjs-91

 .gitlab-ci.yml    | 30 +++++++++++++++---------------
 meson.build       |  2 +-
 tools/run_iwyu.sh |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e71eeb7..0664b780 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ build-alpine-image:
       mkdir -p /cwd
 
 .coverage: &coverage
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     coverage: '/^  lines.*(\d+\.\d+\%)/'
   script:
@@ -69,7 +69,7 @@ build-alpine-image:
 build_recommended:
   <<: *build
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:job-1538227_fedora.mozjs78-debug  # pinned on purpose
+  image: registry.gitlab.gnome.org/gnome/gjs:job-1740076_fedora.mozjs91-debug  # pinned on purpose
   variables:
     TEST_OPTS: --verbose --no-stdsplit --print-errorlogs
   except:
@@ -80,7 +80,7 @@ sanitizer_gcc:
   stage: test
   tags:
     - asan # LSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     CONFIG_OPTS: -Db_sanitize=address,undefined
     TEST_OPTS: --timeout-multiplier=3
@@ -94,7 +94,7 @@ sanitizer_thread_gcc:
   allow_failure: true
   tags:
     - asan # TSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     CONFIG_OPTS: -Db_sanitize=thread
     TEST_OPTS: --timeout-multiplier=3
@@ -107,7 +107,7 @@ sanitizer_thread_gcc:
 build_maximal:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     CC: clang
     CXX: clang++
@@ -123,7 +123,7 @@ build_maximal:
 build_minimal:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91
   variables:
     CONFIG_OPTS: >-
       -Dbuildtype=release
@@ -134,7 +134,7 @@ build_minimal:
 build_unity:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91
   variables:
     # unity-size here is forced to use an high number to check whether we can
     # join all the sources together, but should not be used in real world to
@@ -245,7 +245,7 @@ pch_check:
 iwyu:
   when: on_success
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   script:
     - test/test-ci.sh UPSTREAM_BASE
     - meson setup _build -Db_pch=false
@@ -296,7 +296,7 @@ coverage:
 iwyu-full:
   when: manual
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   script:
     - meson setup _build
     - ./tools/run_iwyu.sh
@@ -308,7 +308,7 @@ sanitizer_clang:
   stage: manual
   tags:
     - asan # LSAN needs CAP_SYS_PTRACE
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     CC: clang
     CXX: clang++
@@ -321,7 +321,7 @@ sanitizer_clang:
 installed_tests:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     CONFIG_OPTS: -Dinstalled_tests=true -Dprefix=/usr
     TEST: skip
@@ -337,7 +337,7 @@ installed_tests:
 valgrind:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TEST_OPTS: --setup=valgrind
   allow_failure: true
@@ -349,7 +349,7 @@ valgrind:
 zeal_2:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TEST_OPTS: --setup=extra_gc
   when: manual
@@ -359,7 +359,7 @@ zeal_2:
 zeal_4:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TEST_OPTS: --setup=pre_verify
   when: manual
@@ -369,7 +369,7 @@ zeal_4:
 zeal_11:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs78-debug
+  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs91-debug
   variables:
     TEST_OPTS: --setup=post_verify
   when: manual
diff --git a/meson.build b/meson.build
index 53715bd1..4f5346de 100644
--- a/meson.build
+++ b/meson.build
@@ -125,7 +125,7 @@ gio = dependency('gio-2.0', version: glib_required_version,
 ffi = dependency('libffi', fallback: ['libffi', 'ffi_dep'])
 gi = dependency('gobject-introspection-1.0', version: '>= 1.66.0',
     fallback: ['gobject-introspection', 'girepo_dep'])
-spidermonkey = dependency('mozjs-78', version: '>= 78.2.0')
+spidermonkey = dependency('mozjs-91', version: '>= 91.3.0')
 
 # We might need to look for the headers and lib's for Cairo
 # manually on MSVC/clang-cl builds...
diff --git a/tools/run_iwyu.sh b/tools/run_iwyu.sh
index d89294c0..8b3fdbb3 100755
--- a/tools/run_iwyu.sh
+++ b/tools/run_iwyu.sh
@@ -46,7 +46,7 @@ echo "files: $files"
 IWYU="python3 $(which iwyu_tool || which iwyu-tool || which iwyu_tool.py) -p ."
 IWYU_ARGS="-Wno-pragma-once-outside-header"
 IWYU_RAW="include-what-you-use -xc++ -std=c++17 -Xiwyu --keep=config.h $IWYU_ARGS"
-IWYU_RAW_INC="-I. -I.. $(pkg-config --cflags gobject-introspection-1.0 mozjs-78)"
+IWYU_RAW_INC="-I. -I.. $(pkg-config --cflags gobject-introspection-1.0 mozjs-91)"
 PRIVATE_MAPPING="-Xiwyu --mapping_file=$SRCDIR/tools/gjs-private-iwyu.imp -Xiwyu --keep=config.h"
 PUBLIC_MAPPING="-Xiwyu --mapping_file=$SRCDIR/tools/gjs-public-iwyu.imp"
 POSTPROCESS="python3 $SRCDIR/tools/process_iwyu.py"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]