updated arm to NWJS 0.54.2 with 64 bit capability

rolled to v1.21.0928

.gitlab-ci.yml

@@ -183,6 +183,10 @@ intel-packaging:
 
 arm-packaging:
   stage: package
+  variables:
+    NWJS_VERSION: "v0.54.2"
+    NWJS32_BUILD: "nw54_2021-07-09"
+    NWJS64_BUILD: "nw54-arm64_2021-07-10"
   rules:
     # only do this with a manual tag starting with v or test_
     - if: '$CI_COMMIT_TAG =~ /^(v|test_).*/'
@@ -212,23 +216,39 @@ arm-packaging:
       apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" build-dep .
       echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
     - test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
-    # This is for ARM arch build
+    # This is for ARM 32 arch build
     - |
-      echo -e "\e[0Ksection_start:`date +%s`:arm_build\r\e[0KBuilding ARM packages"
+      wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/$NWJS32_BUILD/$NWJS32_BUILD.tar.gz
-      wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/nw49_2020-10-26/nw49_2020-10-26.tar.gz
+      tar -xf $NWJS32_BUILD.tar.gz
-      tar -xf nw49_2020-10-26.tar.gz
+      tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-$NWJS_VERSION-linux-arm.tar.gz
-      tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-v0.49.2-linux-arm.tar.gz
+      rm nwjs-$NWJS_VERSION-linux-arm/locales/*.info
-      rm nwjs-v0.49.2-linux-arm/locales/*.info
+      mv nwjs-$NWJS_VERSION-linux-arm/nw nwjs-$NWJS_VERSION-linux-arm/GridTracker
-      mv nwjs-v0.49.2-linux-arm/nw nwjs-v0.49.2-linux-arm/GridTracker
       ls
       version=`node ./version.js`
-      mkdir GridTracker-$version-linux-arm
+      mkdir GridTracker-$version-linux-arm32
-      cp -r nwjs-v0.49.2-linux-arm/* GridTracker-$version-linux-arm/
+      cp -r nwjs-$NWJS_VERSION-linux-arm/* GridTracker-$version-linux-arm32/
-      cp -r arm/* GridTracker-$version-linux-arm/
+      cp -r arm/* GridTracker-$version-linux-arm32/
-      cp -r package.nw GridTracker-$version-linux-arm/
+      cp -r package.nw GridTracker-$version-linux-arm32/
-      cp LICENSE GridTracker-$version-linux-arm/
+      cp LICENSE GridTracker-$version-linux-arm32/
-      tar -czf GridTracker-$version-linux-arm.tar.gz GridTracker-$version-linux-arm
+      tar -czf GridTracker-$version-linux-arm32.tar.gz GridTracker-$version-linux-arm32
-      mv GridTracker-$version-linux-arm.tar.gz artifacts/
+      mv GridTracker-$version-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
+      tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-$NWJS_VERSION-linux-arm64.tar.gz
+      rm nwjs-$NWJS_VERSION-linux-arm64/locales/*.info
+      mv nwjs-$NWJS_VERSION-linux-arm64/nw nwjs-$NWJS_VERSION-linux-arm64/GridTracker
+      ls
+      version=`node ./version.js`
+      mkdir GridTracker-$version-linux-arm64
+      cp -r nwjs-$NWJS_VERSION-linux-arm64/* GridTracker-$version-linux-arm64/
+      cp -r arm/* GridTracker-$version-linux-arm64/
+      cp -r package.nw GridTracker-$version-linux-arm64/
+      cp LICENSE GridTracker-$version-linux-arm64/
+      tar -czf GridTracker-$version-linux-arm64.tar.gz GridTracker-$version-linux-arm64
+      mv GridTracker-$version-linux-arm64.tar.gz artifacts/
+    
     # This section handles making RPMs for Fedora/CentOS/RHEL
     #- |
       #  echo -e "\e[0Ksection_start:`date +%s`:rpm_build\r\e[0KBuilding RPM packages"
@@ -253,6 +273,8 @@ arm-packaging:
 nr0q_upload_testing:
   stage: deploy
   image: alpine
+  variables:
+    GIT_STRATEGY: none
   rules:
     - if: '$CI_COMMIT_TAG =~ /^(test_).*/ && $NR0Q_SERVER_KEY != ""'
   before_script:
@@ -310,6 +332,8 @@ nr0q_upload_release:
 source_release:
   stage: deploy
   image: registry.gitlab.com/gitlab-org/release-cli:latest
+  variables:
+    GIT_STRATEGY: none
   rules:
     - if: '$CI_COMMIT_TAG =~ /^(v).*/'
   release:

debian/changelog

@@ -1,6 +1,11 @@
-gridtracker (1.21.0926) unstable; urgency=low
+gridtracker (1.21.0928) unstable; urgency=medium
   [Bug Fixes]
-  - This is a test beta to test treating adif records as byte length vs string length
+  - Treat ADIF record values as byte length vs string length (to better handle UTF-8 data).
+  - Remove looking at fetched records for last date for LoTW fetches, Use only headers (More reliable LoTW fetches).
+  [Enhancements]
+  - ARM builds now with NWJS 0.54.2 and 64 bit ARM binaries.
+
+-- Matthew Chambers <nr0q@gridtracker.org> Sun, 28 Sept 2021 00:00:00 -0000
 
  -- Matthew Chambers <nr0q@gridtracker.org> Sund, 26 Sept 2021 19:03:30 -0000
 gridtracker (1.21.0620) unstable; urgency=medium
@@ -109,6 +114,8 @@ gridtracker (1.21.0307) unstable; urgency=medium
     queried from Callook since it usually has more data than free QRZ lookup
   * fixed CR alert script not being triggered for Awared Tracker hits
 
+-- Matthew Chambers <nr0q@gridtracker.org> Sun, 7 Mar 2021 12:00:00 -0000
+
 gridtracker (1.20.1118) unstable; urgency=low
 
   * GridTracker is now Open Source! Copyright assigned to GridTracker.org and

package.nw/package.json

@@ -1,8 +1,8 @@
 {
   "name": "GridTracker",
   "product_string_do_not_use": "gridtracker",
-  "version": "1.21.0926",
+  "version": "1.21.0928",
-  "betaVersion": "utf8",
+  "betaVersion": "",
   "description": "GridTracker, an amateur radio companion",
   "author": "Stephen Loomis (N0TTL) and GridTracker.org",
   "license": "BSD-3-Clause",