Skip to content

Commit

Permalink
#1709 Adds build timestamp info to nightly releases.
Browse files Browse the repository at this point in the history
  • Loading branch information
Dennis Sheirer committed Nov 7, 2023
1 parent 9dbed72 commit ad98b1c
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Expand Up @@ -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:
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/nightly.yml
Expand Up @@ -4,13 +4,16 @@ name: Nightly Release
on:
push:
branches: [ master ]
# Don't run nightly build for pull requests - uncomment to test changes to this action within scope of the PR review
# pull_request:
# 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
Expand All @@ -29,10 +32,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
30 changes: 19 additions & 11 deletions 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
Expand All @@ -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;
Expand All @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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);
}
}
}

Expand Down

0 comments on commit ad98b1c

Please sign in to comment.