From 48b3e084b98120f39b51b8b9741892622318ca1e Mon Sep 17 00:00:00 2001
From: nr0q <nr0q@gridtracker.org>
Date: Sun, 22 Oct 2023 18:59:12 -0500
Subject: [PATCH] split arm into 32 and 64 bit jobs for disk space

---
 .gitlab-ci.yml | 80 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 61 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4065bc1..0553f09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -222,11 +222,70 @@ mac:package:
       echo "we made MAC packages!"
       ls -laR artifacts
 
-arm:package:
+arm32:package:
   stage: package
   variables:
     NWJS_VERSION: "v0.54.2"
     NWJS32_BUILD: "nw54_2021-07-09"
+  rules:
+    # only do this with a manual tag starting with v or test_
+    - if: '$CI_COMMIT_TAG =~ /^(v|test_|lin_).*/'
+  artifacts:
+    paths:
+      - artifacts/
+    name: '$CI_COMMIT_REF_SLUG'
+  cache:
+    paths:
+      - .cache/
+      - node_modules/
+    key:
+      files:
+        - package.json
+        - package.nw/package.json
+  before_script:
+    - |
+      mkdir -p $NPM_CONFIG_CACHE
+      mkdir -p artifacts
+      #dpkg --add-architecture armhf
+      echo -e "\e[0Ksection_start:`date +%s`:apt_get[collapsed=true]\r\e[0KGetting Build Dependencies"
+      apt-get update && apt-get upgrade -y
+      apt-get install gnupg -y
+      curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
+      export GPG_TTY=$(tty)
+      gpg --pinentry-mode loopback --passphrase ${GPG_PASS} --import .secure_files/debiankey.asc
+      echo ${GPG_TRUST} | gpg --import-ownertrust
+      echo 'use-agent' >> ~/.gnupg/gpg.conf
+      echo 'pinentry-mode loopback' >> ~/.gnupg/gpg.conf
+      echo 'allow-loopback-pinentry' >> ~/.gnupg/gpg-agent.conf
+      apt-get build-dep .
+      echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
+  script:
+    - |
+      # This is for ARM 32 arch build
+      test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
+      echo -e "\e[0Ksection_start:`date +%s`:wget[collapsed=true]\r\e[0KGetting Upstream NWJS Binary"
+      wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/$NWJS32_BUILD/$NWJS32_BUILD.tar.gz
+      tar -xf $NWJS32_BUILD.tar.gz
+      tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-$NWJS_VERSION-linux-arm.tar.gz
+      echo -e "\e[0Ksection_end:`date +%s`:wget\r\e[0K"
+      rm nwjs-$NWJS_VERSION-linux-arm/locales/*.info
+      mv nwjs-$NWJS_VERSION-linux-arm/nw nwjs-$NWJS_VERSION-linux-arm/GridTracker
+      VER=`node ./version.js`
+      mkdir GridTracker-${VER}-linux-arm32
+      cp -r nwjs-$NWJS_VERSION-linux-arm/* GridTracker-${VER}-linux-arm32/
+      cp -r arm/* GridTracker-${VER}-linux-arm32/
+      cp -r package.nw GridTracker-${VER}-linux-arm32/
+      cp LICENSE GridTracker-${VER}-linux-arm32/
+      tar -czf GridTracker-${VER}-linux-arm32.tar.gz GridTracker-${VER}-linux-arm32
+      mv GridTracker-${VER}-linux-arm32.tar.gz artifacts/
+      gpg  --batch --no-tty --detach-sign --armor --passphrase ${GPG_PASS} artifacts/GridTracker-${VER}-linux-arm32.tar.gz
+      echo "we made ARM packages!"
+      ls -laR artifacts
+
+arm64:package:
+  stage: package
+  variables:
+    NWJS_VERSION: "v0.54.2"
     NWJS64_BUILD: "nw54-arm64_2021-07-10"
   rules:
     # only do this with a manual tag starting with v or test_
@@ -266,23 +325,6 @@ arm:package:
       echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
   script:
     - |
-      # This is for ARM 32 arch build
-      test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
-      echo -e "\e[0Ksection_start:`date +%s`:wget[collapsed=true]\r\e[0KGetting Upstream NWJS Binary"
-      wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/$NWJS32_BUILD/$NWJS32_BUILD.tar.gz
-      tar -xf $NWJS32_BUILD.tar.gz
-      tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-$NWJS_VERSION-linux-arm.tar.gz
-      echo -e "\e[0Ksection_end:`date +%s`:wget\r\e[0K"
-      rm nwjs-$NWJS_VERSION-linux-arm/locales/*.info
-      mv nwjs-$NWJS_VERSION-linux-arm/nw nwjs-$NWJS_VERSION-linux-arm/GridTracker
-      VER=`node ./version.js`
-      mkdir GridTracker-${VER}-linux-arm32
-      cp -r nwjs-$NWJS_VERSION-linux-arm/* GridTracker-${VER}-linux-arm32/
-      cp -r arm/* GridTracker-${VER}-linux-arm32/
-      cp -r package.nw GridTracker-${VER}-linux-arm32/
-      cp LICENSE GridTracker-${VER}-linux-arm32/
-      tar -czf GridTracker-${VER}-linux-arm32.tar.gz GridTracker-${VER}-linux-arm32
-      mv GridTracker-${VER}-linux-arm32.tar.gz artifacts/
       # This is for ARM 64 arch build
       wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/$NWJS64_BUILD/$NWJS64_BUILD.tar.gz
       tar -xf $NWJS64_BUILD.tar.gz
@@ -296,7 +338,6 @@ arm:package:
       cp LICENSE GridTracker-${VER}-linux-arm64/
       tar -czf GridTracker-${VER}-linux-arm64.tar.gz GridTracker-${VER}-linux-arm64
       mv GridTracker-${VER}-linux-arm64.tar.gz artifacts/
-      gpg  --batch --no-tty --detach-sign --armor --passphrase ${GPG_PASS} artifacts/GridTracker-${VER}-linux-arm32.tar.gz
       gpg  --batch --no-tty --detach-sign --armor --passphrase ${GPG_PASS} artifacts/GridTracker-${VER}-linux-arm64.tar.gz
       # This is for ARM 64 Flatpaks
       echo -e "\e[0Ksection_start:`date +%s`:flatpaks[collapsed=true]\r\e[0KBuilding Flatpak"
@@ -313,6 +354,7 @@ arm:package:
       echo "we made ARM packages!"
       ls -laR artifacts
 
+
 # copy test assets to Google Storage
 upload-Google:
   stage: deploy