diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35be466..82276da 100644 --- a/.gitlab-ci.yml +++ b/.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/nw49_2020-10-26/nw49_2020-10-26.tar.gz - tar -xf nw49_2020-10-26.tar.gz - tar -xf usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-v0.49.2-linux-arm.tar.gz - rm nwjs-v0.49.2-linux-arm/locales/*.info - mv nwjs-v0.49.2-linux-arm/nw nwjs-v0.49.2-linux-arm/GridTracker + 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 + rm nwjs-$NWJS_VERSION-linux-arm/locales/*.info + mv nwjs-$NWJS_VERSION-linux-arm/nw nwjs-$NWJS_VERSION-linux-arm/GridTracker ls version=`node ./version.js` - mkdir GridTracker-$version-linux-arm - cp -r nwjs-v0.49.2-linux-arm/* GridTracker-$version-linux-arm/ - cp -r arm/* GridTracker-$version-linux-arm/ - cp -r package.nw GridTracker-$version-linux-arm/ - cp LICENSE GridTracker-$version-linux-arm/ - tar -czf GridTracker-$version-linux-arm.tar.gz GridTracker-$version-linux-arm - mv GridTracker-$version-linux-arm.tar.gz artifacts/ + mkdir GridTracker-$version-linux-arm32 + cp -r nwjs-$NWJS_VERSION-linux-arm/* GridTracker-$version-linux-arm32/ + cp -r arm/* GridTracker-$version-linux-arm32/ + cp -r package.nw GridTracker-$version-linux-arm32/ + cp LICENSE GridTracker-$version-linux-arm32/ + tar -czf GridTracker-$version-linux-arm32.tar.gz GridTracker-$version-linux-arm32 + 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: diff --git a/debian/changelog b/debian/changelog index 4207670..ac06d70 100644 --- a/debian/changelog +++ b/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 Sun, 28 Sept 2021 00:00:00 -0000 -- Matthew Chambers Sund, 26 Sept 2021 19:03:30 -0000 gridtracker (1.21.0620) unstable; urgency=medium @@ -9,7 +14,7 @@ gridtracker (1.21.0620) unstable; urgency=medium [Enhancements] - Automatic pulling down of acknowledgements.json file daily when doing version check (if enabled). - -- Matthew Chambers Sat, 19 June 2021 16:49:00 -0000 +-- Matthew Chambers Sat, 19 June 2021 16:49:00 -0000 gridtracker (1.21.0613) unstable; urgency=medium [Bug Fixes] @@ -17,7 +22,7 @@ gridtracker (1.21.0613) unstable; urgency=medium [Enhancements] - Updated list of contributors - -- Matthew Chambers Sun, 13 June 2021 03:04:00 -0000 +-- Matthew Chambers Sun, 13 June 2021 03:04:00 -0000 gridtracker (1.21.0530) unstable; urgency=medium [Bug Fixes] @@ -30,7 +35,7 @@ gridtracker (1.21.0530) unstable; urgency=medium [Enhancements] - Add statistical information to call roster title bar - -- Matthew Chambers Sat, 30 May 2021 00:10:00 -0000 +-- Matthew Chambers Sat, 30 May 2021 00:10:00 -0000 gridtracker (1.21.0520) unstable; urgency=medium [Bug Fixes] @@ -46,7 +51,7 @@ gridtracker (1.21.0520) unstable; urgency=medium - Make settings icon a toggle that both opens and closes the settings pane - Grid and IP Address Fields are slightly wider - -- Matthew Chambers Mon, 17 May 2021 02:30:00 -0000 +-- Matthew Chambers Mon, 17 May 2021 02:30:00 -0000 gridtracker (1.21.0407) unstable; urgency=medium [Bug Fixes] @@ -57,12 +62,12 @@ gridtracker (1.21.0407) unstable; urgency=medium - new icon to request ClubLog OQRS QSL - add eQSL check in log file processing - -- Matthew Chambers Wed, 07 Apr 2021 00:00:00 -0000 +-- Matthew Chambers Wed, 07 Apr 2021 00:00:00 -0000 gridtracker (1.21.0327) unstable; urgency=medium This is the public release of the 1.21.0324 hotfix release candidates - -- Matthew Chambers Fri, 27 Mar 2021 00:38:00 -0000 +-- Matthew Chambers Fri, 27 Mar 2021 00:38:00 -0000 gridtracker (1.21.0324) unstable; urgency=medium [Christian Bayer] @@ -72,7 +77,7 @@ gridtracker (1.21.0324) unstable; urgency=medium * Fixed #71 bug with loading adif files This is the hotfix release of the first public release of 1.21.0322 - -- Christian Bayer Wed, 22 Mar 2021 22:00:00 -0500 +-- Christian Bayer Wed, 22 Mar 2021 22:00:00 -0500 gridtracker (1.21.0322) unstable; urgency=medium [Christian Bayer] @@ -81,7 +86,7 @@ gridtracker (1.21.0322) unstable; urgency=medium * Fixed linux and arm packaging This is the public release of 1.21.0307 release candidates - -- Matthew Chambers Mon, 22 Mar 2021 20:30:00 -0500 +-- Matthew Chambers Mon, 22 Mar 2021 20:30:00 -0500 gridtracker (1.21.0307) 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 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 @@ -138,13 +145,13 @@ gridtracker (1.20.1118) unstable; urgency=low * Improve debugging/developer experience by enabling context menus when using nwjs's SDK. - -- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Wed, 04 Nov 2020 15:58:29 -0800 +-- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Wed, 04 Nov 2020 15:58:29 -0800 gridtracker (1.20.0927+repack1) unstable; urgency=high * Clean up nw execution in .desktop and .sh file. - -- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Wed, 07 Oct 2020 09:16:02 -0700 +-- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Wed, 07 Oct 2020 09:16:02 -0700 gridtracker (1.20.0927) unstable; urgency=medium @@ -154,4 +161,4 @@ gridtracker (1.20.0927) unstable; urgency=medium [ Paul Traina ] * Debian package building support - -- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Mon, 28 Sep 2020 14:06:49 -0700 +-- Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Mon, 28 Sep 2020 14:06:49 -0700 diff --git a/package.nw/gt_update.odt b/package.nw/gt_update.odt index 3a83295..417374d 100644 Binary files a/package.nw/gt_update.odt and b/package.nw/gt_update.odt differ diff --git a/package.nw/gt_update.pdf b/package.nw/gt_update.pdf index ec6f924..d32bf42 100644 Binary files a/package.nw/gt_update.pdf and b/package.nw/gt_update.pdf differ diff --git a/package.nw/package.json b/package.nw/package.json index 8ed545a..e3cd574 100644 --- a/package.nw/package.json +++ b/package.nw/package.json @@ -1,8 +1,8 @@ { "name": "GridTracker", "product_string_do_not_use": "gridtracker", - "version": "1.21.0926", - "betaVersion": "utf8", + "version": "1.21.0928", + "betaVersion": "", "description": "GridTracker, an amateur radio companion", "author": "Stephen Loomis (N0TTL) and GridTracker.org", "license": "BSD-3-Clause",