From 360318cef1730afd1aa7a547f94b36cf20c0edc0 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Mon, 3 Nov 2025 18:12:29 -0500 Subject: [PATCH 1/2] chore: fix gitattributes; guardrail against *.db changes Signed-off-by: Ricardo Zanini --- .gitattributes | 3 ++- .github/workflows/release.yml | 3 +++ .../java/io/serverlessworkflow/impl/test/DBGenerator.java | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 07764a78d..29ee25536 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -* text eol=lf \ No newline at end of file +* text eol=lf +*.db -text -eol -working-tree-encoding -merge -diff diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd34741de..c806ae262 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,7 @@ on: types: [closed] paths: - '.github/project.yml' + workflow_dispatch: {} permissions: contents: write @@ -61,6 +62,8 @@ jobs: run: | git checkout -b release mvn -B release:prepare -DperformRelease -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} + git restore --source=HEAD -- impl/test/db-samples/*.db 2>/dev/null || true + git status --porcelain cat release.properties git checkout ${{github.base_ref}} git rebase release diff --git a/impl/test/src/test/java/io/serverlessworkflow/impl/test/DBGenerator.java b/impl/test/src/test/java/io/serverlessworkflow/impl/test/DBGenerator.java index 706f52776..f1a6adba0 100644 --- a/impl/test/src/test/java/io/serverlessworkflow/impl/test/DBGenerator.java +++ b/impl/test/src/test/java/io/serverlessworkflow/impl/test/DBGenerator.java @@ -28,15 +28,20 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DBGenerator { + private static final Logger LOG = LoggerFactory.getLogger(DBGenerator.class); + public static void main(String[] args) throws IOException { runInstance("db-samples/running_v1.db", false); runInstance("db-samples/suspended_v1.db", true); } private static void runInstance(String dbName, boolean suspend) throws IOException { + LOG.info("---> Generating db samples at {}", dbName); Files.deleteIfExists(Path.of(dbName)); try (PersistenceInstanceHandlers factories = BytesMapPersistenceInstanceHandlers.builder(new MVStorePersistenceStore(dbName)) From 9f8dc2aebdf181c922e54fcdb3cb31306eba9688 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Mon, 3 Nov 2025 18:18:10 -0500 Subject: [PATCH 2/2] Add an additional git clean guardrail Signed-off-by: Ricardo Zanini --- .github/workflows/release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c806ae262..43dffda49 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,10 @@ jobs: run: | git checkout -b release mvn -B release:prepare -DperformRelease -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} - git restore --source=HEAD -- impl/test/db-samples/*.db 2>/dev/null || true + + git restore --staged --worktree -- impl/test/db-samples/** 2>/dev/null || true + git clean -fd -- impl/test/db-samples 2>/dev/null || true + git status --porcelain cat release.properties git checkout ${{github.base_ref}}