From 9dc9b1b2111e437e5b4114786c9ff3c0e6bf32d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Wed, 28 Feb 2024 15:43:15 +0100 Subject: [PATCH 1/2] build: Better way to pick up version in native-image tests --- .github/workflows/native-image-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/native-image-tests.yml b/.github/workflows/native-image-tests.yml index c9f22b75..c07e8924 100644 --- a/.github/workflows/native-image-tests.yml +++ b/.github/workflows/native-image-tests.yml @@ -39,9 +39,11 @@ jobs: jvm: temurin:1.11 - name: Gather version + # some cleanup of the sbt output to get the version sbt will use when publishing below run: |- - echo `git describe --tags | sed -e "s/v\(.*\)-\([0-9][0-9]*\).*/\\1+\\2-/"``git rev-parse HEAD | head -c8`-SNAPSHOT > ~/.version - cat ~/.version + sbt "akka-persistence-r2dbc/version" --batch --no-colors | tail -n 1 | cut -f 2 -d ' ' | tr -d '\n' > ~/.version + echo [$(cat ~/.version)] + # useful for debugging: hexdump -c ~/.version - name: Publish artifacts locally run: |- From c5c25e706c3e50e68594ce7c86b9081577fc5ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Wed, 28 Feb 2024 15:48:27 +0100 Subject: [PATCH 2/2] core is the module name --- .github/workflows/native-image-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/native-image-tests.yml b/.github/workflows/native-image-tests.yml index c07e8924..e939b49e 100644 --- a/.github/workflows/native-image-tests.yml +++ b/.github/workflows/native-image-tests.yml @@ -41,7 +41,7 @@ jobs: - name: Gather version # some cleanup of the sbt output to get the version sbt will use when publishing below run: |- - sbt "akka-persistence-r2dbc/version" --batch --no-colors | tail -n 1 | cut -f 2 -d ' ' | tr -d '\n' > ~/.version + sbt "core/version" --batch --no-colors | tail -n 1 | cut -f 2 -d ' ' | tr -d '\n' > ~/.version echo [$(cat ~/.version)] # useful for debugging: hexdump -c ~/.version