Compare commits

...

4 commits

3 changed files with 8 additions and 10 deletions

View file

@ -3,6 +3,7 @@ name: Run Renovate
on: on:
schedule: schedule:
- cron: "13 * * * *" - cron: "13 * * * *"
workflow_dispatch:
jobs: jobs:
renovate: renovate:
@ -22,7 +23,7 @@ jobs:
RENOVATE_CONFIG_FILE: renovate.json RENOVATE_CONFIG_FILE: renovate.json
RENOVATE_ENDPOINT: ${{ github.api_url }} RENOVATE_ENDPOINT: ${{ github.api_url }}
RENOVATE_GIT_AUTHOR: Renovate Bot <mail+renovate@antville.org> RENOVATE_GIT_AUTHOR: Renovate Bot <mail+renovate@antville.org>
#RENOVATE_GIT_IGNORED_AUTHORS: #RENOVATE_GIT_IGNORED_AUTHORS:
# - 29139614+renovate[bot]@users.noreply.github.com # - 29139614+renovate[bot]@users.noreply.github.com
RENOVATE_IGNORE_PR_AUTHOR: 'true' RENOVATE_IGNORE_PR_AUTHOR: 'true'
RENOVATE_LOG_FILE: renovate-log.ndjson RENOVATE_LOG_FILE: renovate-log.ndjson
@ -33,7 +34,8 @@ jobs:
RENOVATE_TOKEN: ${{ secrets.renovate_token }} RENOVATE_TOKEN: ${{ secrets.renovate_token }}
- name: Save log file - name: Save log file
uses: actions/upload-artifact@v4 # FIXME: v4 of this action causes an error on Forgejo (“You must configure a GitHub token”)
uses: actions/upload-artifact@v3
with: with:
name: renovate-log.ndjson name: renovate-log.ndjson
path: renovate-log.ndjson path: renovate-log.ndjson

View file

@ -172,6 +172,7 @@ tasks.register('processSource', Sync) {
line -> line line -> line
.replaceAll('__builddate__', new Date().format("d MMM yyyy")) .replaceAll('__builddate__', new Date().format("d MMM yyyy"))
.replaceAll('__commithash__', gitOutput.toString().trim()) .replaceAll('__commithash__', gitOutput.toString().trim())
.replaceAll('__version__', version)
} into "${project.buildDir}/src" } into "${project.buildDir}/src"
} }

View file

@ -36,7 +36,7 @@ import helma.util.ResourceProperties;
*/ */
public class Server implements Runnable { public class Server implements Runnable {
// version string // version string
public static final String version = "🐜"; public static final String version = "__version__";
// build date // build date
public static final String buildDate = "__builddate__"; public static final String buildDate = "__builddate__";
@ -151,13 +151,8 @@ public class Server implements Runnable {
public static void checkJavaVersion() { public static void checkJavaVersion() {
String javaVersion = System.getProperty("java.version"); String javaVersion = System.getProperty("java.version");
if ((javaVersion == null) || javaVersion.startsWith("1.5") if ((javaVersion == null) || !javaVersion.startsWith("11")) {
|| javaVersion.startsWith("1.4") System.err.println("This version of Helma requires Java 11 or greater.");
|| javaVersion.startsWith("1.3")
|| javaVersion.startsWith("1.2")
|| javaVersion.startsWith("1.1")
|| javaVersion.startsWith("1.0")) {
System.err.println("This version of Helma requires Java 1.6 or greater.");
if (javaVersion == null) { // don't think this will ever happen, but you never know if (javaVersion == null) { // don't think this will ever happen, but you never know
System.err.println("Your Java Runtime did not provide a version number. Please update to a more recent version."); System.err.println("Your Java Runtime did not provide a version number. Please update to a more recent version.");