Squashed commits '${title}'

.gitlab-ci.yml

@@ -10,9 +10,9 @@ variables:
   # We have code in here for releasing on both GS and S3, control it through variables
   # on GitLab, do not change it in this file.
   #
+  GCLOUD_PROJECT_ID: "cent7-288417"
   GCLOUD_SERVICE_ACCOUNT: /dev/null
-  GCLOUD_RELEASE_DEPLOY_PATH: gs://download.gridtracker.org/release/$CI_COMMIT_TAG
-  GCLOUD_TESTING_DEPLOY_PATH: gs://download.gridtracker.org/testing/$CI_COMMIT_TAG
+  GCLOUD_DEPLOY_PATH: gs://gt_download/$CI_COMMIT_TAG
   NR0Q_SERVER_ADDRESS: ""
   NR0Q_SERVER_PASSWORD: ""
 
@@ -277,51 +277,20 @@ arm:package:
       echo "we made ARM packages!"
       ls -laR artifacts
 
-# copy test assets to NR0Q's server
-uploadtest:
+# copy test assets to Google Storage
+upload-Google:
   stage: deploy
-  image: alpine
+  image: google/cloud-sdk
   variables:
     GIT_STRATEGY: none
   rules:
-    - if: '$CI_COMMIT_TAG =~ /^(test_).*/ && $NR0Q_SERVER_KEY != ""'
-  before_script:
-    - |
-      apk add openssh-client
-      eval $(ssh-agent -s)
-      echo "$NR0Q_SERVER_KEY" | tr -d '\r' | ssh-add -
-      mkdir -p ~/.ssh; chmod 700 ~/.ssh
+    - if: '$CI_COMMIT_TAG =~ /^(v|test_).*/'
   script:
     - |
-      cd artifacts
-      for FILE in *.*
-      do
-        echo "Calculating MD5 Hash for $FILE"
-        md5sum $FILE > $FILE.md5
-      done
-      ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/ && ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "rm latest_test && ln -s $CI_COMMIT_TAG latest_test"
-
-# copy release assets to NR0Q's server
-uploadrelease:
-  stage: deploy
-  image: alpine
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^(v).*/ && $NR0Q_SERVER_KEY != ""'
-  before_script:
-    - |
-      apk add openssh-client
-      eval $(ssh-agent -s)
-      echo "$NR0Q_SERVER_KEY" | tr -d '\r' | ssh-add -
-      mkdir -p ~/.ssh; chmod 700 ~/.ssh
-  script:
-    - |
-      cd artifacts
-      for FILE in *.*
-      do
-        echo "Calculating MD5 Hash for $FILE"
-        md5sum $FILE > $FILE.md5
-      done
-      ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/
+      echo $GCP_SERVICE_KEY > gcloud-service-key.json
+      gcloud auth activate-service-account --key-file gcloud-service-key.json
+      gcloud config set project $GCLOUD_PROJECT_ID
+      gsutil -m cp -R artifacts/* $GCLOUD_DEPLOY_PATH/
 
 # this only creates a "source code release" -- gitlab doesn't specify binaries
 # except as links to external storage, which is suboptimal for now
@@ -341,7 +310,7 @@ sourcerelease:
     assets:
       links:
         - name: Release Packages for $CI_COMMIT_TAG
-          url: https://fleetwood.mchambersradio.com/gridtracker/$CI_COMMIT_TAG/
+          url: https://https://storage.googleapis.com/gt_download/$CI_COMMIT_TAG/
           external: true
           link_type: package
   script:

debian/changelog

@@ -1,3 +1,17 @@
+gridtracker (1.22.0502) unstable; urgency=low
+  [Bug Fixes]
+  - Fixed broken Call Roster due to online assets being moved from a web server to Google Storage Bucket.
+  - Don't highlight "CQ" rows if filtering by "CQ Only".
+  - Resolved #126 Windows Installer script updated to fix issues with install location and missing registry keys
+  - Resolved #124 removing IP-Geolocation when no all other means of locating failed, we now tell the user to
+    start WSJT-X or enter a location  as Geo-Location services are costly and unreliable
+  - Resolved #137 missing libatomic dependency in Linux DEB and RPM spec files
+  [Enhancements]
+  - Include version number in main window title
+  - Call Roster colums refactored and wanted column added
+  
+ -- Matthew Chambers <nr0q@gridtracker.org>  Mon, 01 May 2022 02:25:40 -0000
+
 gridtracker (1.21.1217) unstable; urgency=low
   - Changed to newer NWJS to fix upstream bug that caused media playback to fail.
 

gridtracker.spec

@@ -40,6 +40,17 @@ DESTDIR=${RPM_BUILD_ROOT} make clean
 %license %{_docdir}/%{name}/
 
 %changelog
+* Mon May 02 2022 Matthew Chambers <nr0q@gridtracker.org> - 1.22.0502-1
+- [Bug Fixes]
+  - Fixed broken Call Roster due to online assets being moved from a web server to Google Storage Bucket.
+  - Don't highlight "CQ" rows if filtering by "CQ Only".
+  - Resolved #126 Windows Installer script updated to fix issues with install location and missing registry keys
+  - Resolved #124 removing IP-Geolocation when no all other means of locating failed, we now tell the user to
+    start WSJT-X or enter a location  as Geo-Location services are costly and unreliable
+  - Resolved #137 missing libatomic dependency in Linux DEB and RPM spec files
+- [Enhancements]
+  - Include version number in main window title
+  - Call Roster colums refactored and wanted column added
 * Fri Dec 17 2021 Matthew Chambers <nr0q@gridtracker.org> - 1.21.1217-1
 - Changed to newer NWJS to fix upstream bug that caused media playback to fail.
 * Sun Dec 12 2021 Matthew Chambers <nr0q@gridtracker.org> - 1.21.1212-1

package.nw/GridTracker.html

@@ -1072,7 +1072,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <br />
           <div
             class="button"
-            onclick="require('nw.gui').Shell.openExternal('http://app.gridtracker.org/gt_print.html');"
+            onclick="require('nw.gui').Shell.openExternal('https://storage.googleapis.com/gt_app/gt_print.html');"
           >
             Print
           </div>

package.nw/lib/callsigns.js

@@ -279,7 +279,7 @@ function oqrsDownload(fromSettings)
 {
   oqrsUpdatedTd.innerHTML = "<b><i>Downloading...</i></b>";
   getBuffer(
-    "http://app.gridtracker.org/callsigns/clublog.json",
+    "https://storage.googleapis.com/gt_app/callsigns/clublog.json",
     processoqrsCallsigns,
     null,
     "http",
@@ -539,7 +539,7 @@ function ulsDownload()
   ulsUpdatedTd.innerHTML = "<b><i>Downloading...</i></b>";
   ulsCountTd.innerHTML = 0;
   getChunkedBuffer(
-    "http://app.gridtracker.org/callsigns/callsigns.txt",
+    "https://storage.googleapis.com/gt_app/callsigns/callsigns.txt",
     processulsCallsigns,
     null,
     "http",

package.nw/lib/gt.js

@@ -11145,7 +11145,7 @@ function checkForNewVersion(showUptoDate)
   if (typeof nw != "undefined")
   {
     getBuffer(
-      "http://app.gridtracker.org/version.txt?lang=",
+      "https://storage.googleapis.com/gt_app/version.txt",
       versionCheck,
       showUptoDate,
       "http",
@@ -11159,7 +11159,7 @@ function downloadAcknowledgements()
   if (g_mapSettings.offlineMode == false)
   {
     getBuffer(
-      "http://app.gridtracker.org/acknowledgements.json",
+      "https://storage.googleapis.com/gt_app/acknowledgements.json",
       updateAcks,
       null,
       "http",

package.nw/lib/roster.js

@@ -1160,7 +1160,7 @@ function stateChangedValue(what)
     {
       let callState = r_currentUSState.replace("CN-", "");
       getBuffer(
-        "http://app.gridtracker.org/callsigns/" + callState + ".callsigns.json",
+        "https://storage.googleapis.com/gt_app/callsigns/" + callState + ".callsigns.json",
         callsignResult,
         r_currentUSState,
         "http",
@@ -1526,7 +1526,7 @@ function init()
   if (window.opener.g_mapSettings.offlineMode == false)
   {
     getBuffer(
-      "http://app.gridtracker.org/callsigns/manifest.json",
+      "https://storage.googleapis.com/gt_app/callsigns/manifest.json",
       manifestResult,
       null,
       "http",

package.nw/package.json

@@ -1,7 +1,7 @@
 {
   "name": "GridTracker",
   "product_string_do_not_use": "gridtracker",
-  "version": "1.21.1217",
+  "version": "1.22.0502",
   "betaVersion": "",
   "description": "GridTracker, an amateur radio companion",
   "author": "Stephen Loomis (N0TTL) and GridTracker.org",
@@ -23,7 +23,7 @@
     "start": "run --mirror https://dl.nwjs.io/ ."
   },
   "build": {
-    "nwVersion": "0.59.0",
+    "nwVersion": "0.54.0",
     "output": "../dist/.",
     "targets": [
       "zip",