From 58f6e24a073c83575f38c9cb5454b9c50de5fa05 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Fri, 22 Sep 2023 00:54:14 -0800
Subject: [PATCH] Fix installation of kerberos module on armv7l (#6442)

Also build with the same version of Node we will release with.
---
 .github/workflows/release.yaml | 17 +++++++++++++++--
 patches/series                 |  1 -
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 46814c9f6ee3..764a37038dc6 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -129,7 +129,7 @@ jobs:
       - name: Install Node.js v18
         uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: "18.15.0"
 
       - name: Install nfpm
         run: |
@@ -137,11 +137,24 @@ jobs:
           curl -sSfL https://github.com/goreleaser/nfpm/releases/download/v2.3.1/nfpm_2.3.1_`uname -s`_`uname -m`.tar.gz | tar -C ~/.local/bin -zxv nfpm
           echo "$HOME/.local/bin" >> $GITHUB_PATH
 
-      - name: Install cross-compiler and system dependencies
+      - name: Install cross-compiler and system dependencies (arm64)
+        if: ${{ matrix.arch != 'armv7l' }}
         run: sudo apt update && sudo apt install -y $PACKAGE libkrb5-dev
         env:
           PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
 
+      - name: Install cross-compiler and system dependencies (armv7l)
+        if: ${{ matrix.arch == 'armv7l' }}
+        run: |
+          sudo sed -i "s/^deb/deb [arch=amd64,i386]/g" /etc/apt/sources.list
+          echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ $(lsb_release -s -c) main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list
+          echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ $(lsb_release -s -c)-updates main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list
+          sudo dpkg --add-architecture armhf
+          sudo apt update
+          sudo apt install -y $PACKAGE libkrb5-dev:armhf
+        env:
+          PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
+
       - name: Download npm package
         uses: actions/download-artifact@v3
         with:
diff --git a/patches/series b/patches/series
index 195f702d4581..dba2e20a31a5 100644
--- a/patches/series
+++ b/patches/series
@@ -20,4 +20,3 @@ display-language.diff
 cli-window-open.diff
 getting-started.diff
 safari.diff
-dependencies.diff