From fba1d197dbe8839db4ea9e1361485df6de698bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 3 Jan 2025 14:49:53 +0100 Subject: [PATCH 1/8] Let Renovate autodiscover only repos with a certain topic --- .github/workflows/renovate.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index e2bab10d..dac173a1 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -19,10 +19,11 @@ jobs: # See LOG_LEVEL: info # debug | info | warn | error | fatal RENOVATE_AUTODISCOVER: 'true' + RENOVATE_AUTODISCOVER_TOPICS: ['renovate'] RENOVATE_CONFIG_FILE: renovate.json RENOVATE_ENDPOINT: ${{ github.api_url }} RENOVATE_GIT_AUTHOR: Renovate Bot - #RENOVATE_GIT_IGNORED_AUTHORS: + #RENOVATE_GIT_IGNORED_AUTHORS: # - 29139614+renovate[bot]@users.noreply.github.com RENOVATE_IGNORE_PR_AUTHOR: 'true' RENOVATE_LOG_FILE: renovate-log.ndjson From 654d6964dddf738689d8f9096ebba7348b600cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 3 Jan 2025 15:22:23 +0100 Subject: [PATCH 2/8] Add the actual version string to helma.main.Server again --- build.gradle | 1 + src/main/java/helma/main/Server.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 620f953f..abf4287f 100644 --- a/build.gradle +++ b/build.gradle @@ -172,6 +172,7 @@ tasks.register('processSource', Sync) { line -> line .replaceAll('__builddate__', new Date().format("d MMM yyyy")) .replaceAll('__commithash__', gitOutput.toString().trim()) + .replaceAll('__version__', version) } into "${project.buildDir}/src" } diff --git a/src/main/java/helma/main/Server.java b/src/main/java/helma/main/Server.java index b747f11e..90564689 100644 --- a/src/main/java/helma/main/Server.java +++ b/src/main/java/helma/main/Server.java @@ -36,7 +36,7 @@ import helma.util.ResourceProperties; */ public class Server implements Runnable { // version string - public static final String version = "🐜"; + public static final String version = "__version__"; // build date public static final String buildDate = "__builddate__"; From 52de5bdbdbd311f4c3bd4f815d67b2fe88ccf83d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 3 Jan 2025 15:22:47 +0100 Subject: [PATCH 3/8] Replace elaborate checks for Java version with single one for Java 11 --- src/main/java/helma/main/Server.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/helma/main/Server.java b/src/main/java/helma/main/Server.java index 90564689..6155de3b 100644 --- a/src/main/java/helma/main/Server.java +++ b/src/main/java/helma/main/Server.java @@ -151,13 +151,8 @@ public class Server implements Runnable { public static void checkJavaVersion() { String javaVersion = System.getProperty("java.version"); - if ((javaVersion == null) || javaVersion.startsWith("1.5") - || javaVersion.startsWith("1.4") - || 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) || !javaVersion.startsWith("11")) { + System.err.println("This version of Helma requires Java 11 or greater."); 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."); From 0f9602d4821640d98ebbdb8497ca70b2de8af669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 3 Jan 2025 15:32:22 +0100 Subject: [PATCH 4/8] test pls ignore --- .github/workflows/renovate.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index dac173a1..54aab19e 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -3,6 +3,7 @@ name: Run Renovate on: schedule: - cron: "13 * * * *" + workflow_dispatch: jobs: renovate: @@ -19,7 +20,7 @@ jobs: # See LOG_LEVEL: info # debug | info | warn | error | fatal RENOVATE_AUTODISCOVER: 'true' - RENOVATE_AUTODISCOVER_TOPICS: ['renovate'] + #RENOVATE_AUTODISCOVER_TOPICS: ['renovate'] RENOVATE_CONFIG_FILE: renovate.json RENOVATE_ENDPOINT: ${{ github.api_url }} RENOVATE_GIT_AUTHOR: Renovate Bot @@ -34,7 +35,7 @@ jobs: RENOVATE_TOKEN: ${{ secrets.renovate_token }} - name: Save log file - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: renovate-log.ndjson path: renovate-log.ndjson From 66fa98353ee5287aae50a6c864b248ed5f095c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 3 Jan 2025 15:22:23 +0100 Subject: [PATCH 5/8] Add the actual version string to helma.main.Server again --- build.gradle | 1 + src/main/java/helma/main/Server.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 620f953f..abf4287f 100644 --- a/build.gradle +++ b/build.gradle @@ -172,6 +172,7 @@ tasks.register('processSource', Sync) { line -> line .replaceAll('__builddate__', new Date().format("d MMM yyyy")) .replaceAll('__commithash__', gitOutput.toString().trim()) + .replaceAll('__version__', version) } into "${project.buildDir}/src" } diff --git a/src/main/java/helma/main/Server.java b/src/main/java/helma/main/Server.java index b747f11e..90564689 100644 --- a/src/main/java/helma/main/Server.java +++ b/src/main/java/helma/main/Server.java @@ -36,7 +36,7 @@ import helma.util.ResourceProperties; */ public class Server implements Runnable { // version string - public static final String version = "🐜"; + public static final String version = "__version__"; // build date public static final String buildDate = "__builddate__"; From d10f8d6d90c492533677ffca2a15234905cb0485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 3 Jan 2025 15:22:47 +0100 Subject: [PATCH 6/8] Replace elaborate checks for Java version with single one for Java 11 --- src/main/java/helma/main/Server.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/helma/main/Server.java b/src/main/java/helma/main/Server.java index 90564689..6155de3b 100644 --- a/src/main/java/helma/main/Server.java +++ b/src/main/java/helma/main/Server.java @@ -151,13 +151,8 @@ public class Server implements Runnable { public static void checkJavaVersion() { String javaVersion = System.getProperty("java.version"); - if ((javaVersion == null) || javaVersion.startsWith("1.5") - || javaVersion.startsWith("1.4") - || 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) || !javaVersion.startsWith("11")) { + System.err.println("This version of Helma requires Java 11 or greater."); 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."); From d18513fb764326d005de1362e7280c04dee76ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 3 Jan 2025 15:50:47 +0100 Subject: [PATCH 7/8] Downgrade upload-artifact action again v4 causes an error --- .github/workflows/renovate.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index e2bab10d..6c163a9d 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -22,7 +22,7 @@ jobs: RENOVATE_CONFIG_FILE: renovate.json RENOVATE_ENDPOINT: ${{ github.api_url }} RENOVATE_GIT_AUTHOR: Renovate Bot - #RENOVATE_GIT_IGNORED_AUTHORS: + #RENOVATE_GIT_IGNORED_AUTHORS: # - 29139614+renovate[bot]@users.noreply.github.com RENOVATE_IGNORE_PR_AUTHOR: 'true' RENOVATE_LOG_FILE: renovate-log.ndjson @@ -33,7 +33,8 @@ jobs: RENOVATE_TOKEN: ${{ secrets.renovate_token }} - 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: name: renovate-log.ndjson path: renovate-log.ndjson From 6d355fc5bdc443f629c3fdc3998fbcd0d911b58e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 3 Jan 2025 15:55:49 +0100 Subject: [PATCH 8/8] Allow manual trigger of Renovate workflow --- .github/workflows/renovate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 6c163a9d..230c84e6 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -3,6 +3,7 @@ name: Run Renovate on: schedule: - cron: "13 * * * *" + workflow_dispatch: jobs: renovate: