Merge pull request #85 from rbrich/renovate/xterm-monorepo

Update xterm monorepo

Author: rbrich

.github/workflows/ci.yml

@@ -52,10 +52,10 @@ jobs:
           cc: gcc-10
           cxx: g++-10
           build_args: "--minsize --unity"
-        - os: macos-10.15
+        - os: macos-11
           name: "Clang 13 / Release"
           clang: brew
-          os_target: "10.15"
+          os_target: "11.0"
           build_args: "--precache-deps"
         - os: macos-11
           name: "AppleClang / Release"
@@ -117,8 +117,8 @@ jobs:
         elif [[ "$RUNNER_OS" == "macOS" ]]; then
             brew install ccache ninja glfw doxygen google-benchmark hyperscan harfbuzz freetype
             if [[ "${{ matrix.clang }}" == "brew" ]] ; then
-                export CC="$(brew --prefix llvm)/bin/clang"
-                export CXX="$(brew --prefix llvm)/bin/clang++"
+                export CC="$(brew --prefix llvm@13)/bin/clang"
+                export CXX="$(brew --prefix llvm@13)/bin/clang++"
                 echo "CC='$CC'" >> $GITHUB_ENV
                 echo "CXX='$CXX'" >> $GITHUB_ENV
             fi

build.sh

@@ -276,12 +276,14 @@ if phase deps; then
     (
         run cd "${BUILD_DIR}"
 
-        if [[ ! -f 'system_deps.txt' ]] ; then
-            echo 'Checking for preinstalled dependencies...'
-            "${PYTHON}" "${ROOT_DIR}/detect_system_deps.py" "${DETECT_ARGS[@]}" | tee 'system_deps.txt'
+        if [[ "$EMSCRIPTEN" -eq 0 ]]; then
+            if [[ ! -f 'system_deps.txt' ]] ; then
+                echo 'Checking for preinstalled dependencies...'
+                "${PYTHON}" "${ROOT_DIR}/detect_system_deps.py" "${DETECT_ARGS[@]}" | tee 'system_deps.txt'
+            fi
+            # shellcheck disable=SC2207
+            CONAN_ARGS+=($(tail -n1 'system_deps.txt'))
         fi
-        # shellcheck disable=SC2207
-        CONAN_ARGS+=($(tail -n1 'system_deps.txt'))
 
         run conan install "${ROOT_DIR}" \
             --build missing \
@@ -298,7 +300,7 @@ if phase config; then
         [[ "$EMSCRIPTEN" -eq 1 ]] && WRAPPER=emcmake
         run cd "${BUILD_DIR}"
         # shellcheck disable=SC2207
-        CMAKE_ARGS+=($(tail -n2 'system_deps.txt' | head -n1))
+        [[ "$EMSCRIPTEN" -eq 0 ]] && CMAKE_ARGS+=($(tail -n2 'system_deps.txt' | head -n1))
         XCI_CMAKE_COLORS=1 run ${WRAPPER} cmake "${ROOT_DIR}" \
             "${CMAKE_ARGS[@]}" \
             -D"CMAKE_BUILD_TYPE=${BUILD_TYPE}" \

docker/emscripten/Dockerfile

@@ -23,10 +23,9 @@ RUN conan config set general.revisions_enabled=1
 
 # Preinstall Conan deps
 ENV XCIKIT=/home/builder/xcikit
-COPY --chown=builder build.sh detect_system_deps.py precache_upstream_deps.py \
-    conanfile.py conandata.yml VERSION $XCIKIT/
-RUN $XCIKIT/build.sh deps --precache-deps --emscripten script
-RUN $XCIKIT/build.sh deps --precache-deps --emscripten script --debug
+COPY --chown=builder build.sh detect_system_deps.py conanfile.py conandata.yml VERSION $XCIKIT/
+RUN $XCIKIT/build.sh deps --emscripten script
+RUN $XCIKIT/build.sh deps --emscripten script --debug
 
 # Preinstall Emscripten ports (it has no explicit install command, workaround...)
 RUN echo "int main(){}" > ~/dummy.c

extras/fire_script_js/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "xterm": "4.18.0",
+    "xterm": "4.19.0",
     "xterm-addon-fit": "0.5.0",
-    "xterm-addon-web-links": "0.5.1"
+    "xterm-addon-web-links": "0.6.0"
   },
   "devDependencies": {
     "webpack": "5.73.0",