#1709 Adds build timestamp info to nightly releases.

DSheirer · Nov 7, 2023 · 9d4b5eb · 9d4b5eb
1 parent 9dbed72
commit 9d4b5eb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK 20
         uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -4,13 +4,15 @@ name: Nightly Release
 on:
   push:
     branches: [ master ]
+  pull_request:           # Uncomment to test github action in the PR review
+    branches: [ master ]
 
 jobs:
   nightly:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 20
         uses: actions/setup-java@v3
@@ -29,10 +31,16 @@ jobs:
         with:
           arguments: runtimeZipWindows -PprojectVersion=nightly
 
+      - name: Create Build Info file
+        run: |
+          echo -e "ref: $GITHUB_REF \ncommit: $GITHUB_SHA\nbuild: $(date +"%Y-%m-%dT%H:%M:%SZ")" > build/image/build_info.txt
+
       - name: Add build artifacts to nightly release
         uses: pyTooling/Actions/releaser@main
         with:
           tag: nightly
           rm: false
           token: ${{ secrets.GITHUB_TOKEN }}
-          files: build/image/*.zip
+          files: |
+            build/image/*.zip
+            build/image/build_info.txt
diff --git a/src/main/java/io/github/dsheirer/properties/SystemProperties.java b/src/main/java/io/github/dsheirer/properties/SystemProperties.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,16 +14,13 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- ******************************************************************************/
+ * ****************************************************************************
+ */
 package io.github.dsheirer.properties;
 
 import io.github.dsheirer.gui.SDRTrunk;
 import io.github.dsheirer.util.ThreadPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.awt.*;
+import java.awt.Color;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -37,6 +34,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.jar.Manifest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * SystemProperties - provides an isolated instance of properties for the application
@@ -48,6 +47,7 @@ public class SystemProperties
     private static String DEFAULT_APP_ROOT = "SDRTrunk";
     private static String PROPERTIES_FILENAME = "SDRTrunk.properties";
     private static String MANIFEST_VERSION = "Implementation-Version";
+    private static String BUILD_TIMESTAMP = "Build-Timestamp";
 
     private static SystemProperties INSTANCE;
     private static Properties mProperties;
@@ -208,11 +208,19 @@ public String getApplicationName()
             if(manifest != null)
             {
                 String version = manifest.getMainAttributes().getValue(MANIFEST_VERSION);
+                String timestamp = manifest.getMainAttributes().getValue(BUILD_TIMESTAMP);
 
                 if(version != null)
                 {
-                    sb.append(" v");
-                    sb.append(version);
+                    if(version.contains("nightly") && timestamp != null)
+                    {
+                        sb.append( " nightly - ").append(timestamp);
+                    }
+                    else
+                    {
+                        sb.append(" v");
+                        sb.append(version);
+                    }
                 }
             }