From 9ec483c68fa0b8ea9c263643a75503faea06b4f6 Mon Sep 17 00:00:00 2001
From: Ben Gotow <ben@foundry376.com>
Date: Sun, 14 Sep 2025 22:27:27 -0500
Subject: [PATCH] Move linux build setup to a script so we can install newer
 NodeJS

---
 .github/workflows/build-linux-setup.sh | 17 +++++++++++++++++
 .github/workflows/build-linux.yaml     | 10 +++-------
 mailsync                               |  2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100755 .github/workflows/build-linux-setup.sh

diff --git a/.github/workflows/build-linux-setup.sh b/.github/workflows/build-linux-setup.sh
new file mode 100755
index 000000000..0154e5111
--- /dev/null
+++ b/.github/workflows/build-linux-setup.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+apt-get update -y
+apt install -y software-properties-common
+apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+apt install -y gcc-8 g++-8 autoconf automake build-essential clang cmake execstack fakeroot g++-5 git libc-ares-dev libctemplate-dev curl libglib2.0-dev libgnome-keyring-dev libicu-dev libsasl2-dev libsasl2-modules libsasl2-modules-gssapi-mit libsecret-1-dev libssl-dev libnss3 libnss3-dev libtidy-dev libtool libxext-dev libxkbfile-dev libxml2-dev libxtst-dev rpm uuid-dev xvfb
+
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+nvm install 16.15.1
+nvm alias default 16.15.1
+
+export PATH="$PATH:$(dirname $(nvm which current))"
diff --git a/.github/workflows/build-linux.yaml b/.github/workflows/build-linux.yaml
index e1352f8a4..6eb6e5ac2 100644
--- a/.github/workflows/build-linux.yaml
+++ b/.github/workflows/build-linux.yaml
@@ -10,16 +10,12 @@ jobs:
     container: ubuntu:18.04
 
     steps:
-      - name: Install deps
-        run: |
-          apt-get update -y
-          apt install -y software-properties-common
-          apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
-          apt install -y nodejs autoconf automake build-essential clang cmake execstack fakeroot g++-5 git libc-ares-dev libctemplate-dev libcurl4-openssl-dev libglib2.0-dev libgnome-keyring-dev libicu-dev libsasl2-dev libsasl2-modules libsasl2-modules-gssapi-mit libsecret-1-dev libssl-dev libnss3 libnss3-dev libtidy-dev libtool libxext-dev libxkbfile-dev libxml2-dev libxtst-dev rpm uuid-dev xvfb
-
       - name: Checkout Repo
         uses: actions/checkout@v3
 
+      - name: Install deps
+        run: .github/workflows/build-linux-setup.sh
+
       - name: Cache NodeJS modules
         uses: actions/cache@v4
         with:
diff --git a/mailsync b/mailsync
index 1f640bb01..d756d8f55 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit 1f640bb018eb9455c109d80c4d8d50fe82d0ba2f
+Subproject commit d756d8f55d9bd938f6e3d5574fab606139f264f0