From 9a7006f138d45da7918b9f5efc8e41b2c14dbf6a Mon Sep 17 00:00:00 2001
From: Christophe '116' Loiseau <116@lab0.net>
Date: Wed, 24 Apr 2024 15:09:25 +0200
Subject: [PATCH 1/9] Set version at publishing

---
 .github/workflows/publish.yml | 8 +++++++-
 gradle.properties             | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 709d5dda782..dfb911a7651 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -25,7 +25,13 @@ jobs:
 
       - name: "Gradle: Publish"
         if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/sovity/') }}
-        run: ./gradlew check publishAllPublicationsToGitHubPackagesRepository ${{ env.GRADLE_ARGS }}
+        run: |
+          if [[ "$GITHUB_REF" == "refs/tags/v"* ]]; then
+            GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/tags/v}"
+          else if [[ "$GITHUB_REF" == "refs/heads/sovity/"* ]]; then
+            GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/heads/sovity/}.0.$(date '+%Y%m%d.%H%M%S')"
+          fi
+          ./gradlew "$GRADLE_ARGS" check publishAllPublicationsToGitHubPackagesRepository
         env:
           USERNAME: ${{ github.actor }}
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/gradle.properties b/gradle.properties
index 301bb2a0fcb..ab382178f71 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group=org.eclipse.edc
-version=0.2.1.2
+version=0.2.1-SNAPSHOT
 # for now, we're using the same version for the autodoc plugin, the processor and the runtime-metamodel lib, but that could
 # change in the future
 annotationProcessorVersion=0.2.1-SNAPSHOT

From 6055e7837044cd0191c386166117d05b6e32e107 Mon Sep 17 00:00:00 2001
From: Christophe '116' Loiseau <116@lab0.net>
Date: Wed, 24 Apr 2024 15:10:47 +0200
Subject: [PATCH 2/9] Single start wildcard

---
 .github/workflows/publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index dfb911a7651..fedd8465585 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,11 +1,11 @@
 
 on:
   push:
-    branches: [ "sovity/**" ]
+    branches: [ "sovity/*" ]
   release:
     types: [ published ]
   pull_request:
-    branches: [ "sovity/**" ]
+    branches: [ "sovity/*" ]
 
 jobs:
   build-gradle-project:

From faeb275e2b6dc5aa6cc014ef26fd0eb1c6558e31 Mon Sep 17 00:00:00 2001
From: Christophe '116' Loiseau <116@lab0.net>
Date: Wed, 24 Apr 2024 15:14:15 +0200
Subject: [PATCH 3/9] Double star wildcard

---
 .github/workflows/publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index fedd8465585..dfb911a7651 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,11 +1,11 @@
 
 on:
   push:
-    branches: [ "sovity/*" ]
+    branches: [ "sovity/**" ]
   release:
     types: [ published ]
   pull_request:
-    branches: [ "sovity/*" ]
+    branches: [ "sovity/**" ]
 
 jobs:
   build-gradle-project:

From 8e4b9acc06779585ea3ec4658c4003cc7b2e76cb Mon Sep 17 00:00:00 2001
From: Christophe '116' Loiseau <116@lab0.net>
Date: Wed, 24 Apr 2024 15:17:19 +0200
Subject: [PATCH 4/9] Test gradle args

---
 .github/workflows/publish.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index dfb911a7651..0bbfdb4efe9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -30,8 +30,11 @@ jobs:
             GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/tags/v}"
           else if [[ "$GITHUB_REF" == "refs/heads/sovity/"* ]]; then
             GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/heads/sovity/}.0.$(date '+%Y%m%d.%H%M%S')"
+          else
+            GRADLE_ARGS="-Pversion=0.$(date '+%Y%m%d.%H%M%S')"
           fi
-          ./gradlew "$GRADLE_ARGS" check publishAllPublicationsToGitHubPackagesRepository
+          echo "$GRADLE_ARGS"
+          #./gradlew "$GRADLE_ARGS" check publishAllPublicationsToGitHubPackagesRepository
         env:
           USERNAME: ${{ github.actor }}
           TOKEN: ${{ secrets.GITHUB_TOKEN }}

From b3cdf3d747da106580d11e39e2494d75e91a7b27 Mon Sep 17 00:00:00 2001
From: Christophe '116' Loiseau <116@lab0.net>
Date: Wed, 24 Apr 2024 15:18:13 +0200
Subject: [PATCH 5/9] change publish

---
 .github/workflows/publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0bbfdb4efe9..3f42eb1747e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -24,7 +24,7 @@ jobs:
         run: echo ${{ github.ref }}
 
       - name: "Gradle: Publish"
-        if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/sovity/') }}
+        if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/sovity/') || startsWith(github.ref, 'refs/pull/') }}
         run: |
           if [[ "$GITHUB_REF" == "refs/tags/v"* ]]; then
             GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/tags/v}"

From cffeb46ff898457226931882b8aabc4f7bc5bc4e Mon Sep 17 00:00:00 2001
From: Christophe '116' Loiseau <116@lab0.net>
Date: Wed, 24 Apr 2024 15:21:54 +0200
Subject: [PATCH 6/9] change publish

---
 .github/workflows/publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3f42eb1747e..90fa0870fae 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: ./.github/actions/run-tests
 
       - name: Debug
-        run: echo ${{ github.ref }}
+        run: echo ${{ github.ref }} ; echo ${GITHUB_REF}
 
       - name: "Gradle: Publish"
         if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/sovity/') || startsWith(github.ref, 'refs/pull/') }}

From 359c17d738caf52a0243a6bc8401c0516f5ecba7 Mon Sep 17 00:00:00 2001
From: Christophe '116' Loiseau <116@lab0.net>
Date: Wed, 24 Apr 2024 15:24:12 +0200
Subject: [PATCH 7/9] change publish

---
 .github/workflows/publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 90fa0870fae..7405a1d2f11 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -28,7 +28,7 @@ jobs:
         run: |
           if [[ "$GITHUB_REF" == "refs/tags/v"* ]]; then
             GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/tags/v}"
-          else if [[ "$GITHUB_REF" == "refs/heads/sovity/"* ]]; then
+          elif [[ "$GITHUB_REF" == "refs/heads/sovity/"* ]]; then
             GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/heads/sovity/}.0.$(date '+%Y%m%d.%H%M%S')"
           else
             GRADLE_ARGS="-Pversion=0.$(date '+%Y%m%d.%H%M%S')"

From 646ab97375d633405be0a2e867e727233c84a896 Mon Sep 17 00:00:00 2001
From: Christophe '116' Loiseau <116@lab0.net>
Date: Wed, 24 Apr 2024 15:30:15 +0200
Subject: [PATCH 8/9] change publish

---
 .github/workflows/publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7405a1d2f11..5f566467371 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -30,8 +30,8 @@ jobs:
             GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/tags/v}"
           elif [[ "$GITHUB_REF" == "refs/heads/sovity/"* ]]; then
             GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/heads/sovity/}.0.$(date '+%Y%m%d.%H%M%S')"
-          else
-            GRADLE_ARGS="-Pversion=0.$(date '+%Y%m%d.%H%M%S')"
+          elif [[ "$GITHUB_REF" == "refs/pull/"* ]]; then
+            GRADLE_ARGS="-Pversion=0.PR-$(echo $GITHUB_REF | cut -d '/' -f 3)"
           fi
           echo "$GRADLE_ARGS"
           #./gradlew "$GRADLE_ARGS" check publishAllPublicationsToGitHubPackagesRepository

From 9a57b39a4b1eb12b3983bf7e5e97eaf9ceb58203 Mon Sep 17 00:00:00 2001
From: Christophe '116' Loiseau <116@lab0.net>
Date: Wed, 24 Apr 2024 15:32:49 +0200
Subject: [PATCH 9/9] change publish

---
 .github/workflows/publish.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5f566467371..4a8ddaac91f 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -24,7 +24,7 @@ jobs:
         run: echo ${{ github.ref }} ; echo ${GITHUB_REF}
 
       - name: "Gradle: Publish"
-        if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/sovity/') || startsWith(github.ref, 'refs/pull/') }}
+        if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/sovity/') }}
         run: |
           if [[ "$GITHUB_REF" == "refs/tags/v"* ]]; then
             GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/tags/v}"
@@ -33,8 +33,7 @@ jobs:
           elif [[ "$GITHUB_REF" == "refs/pull/"* ]]; then
             GRADLE_ARGS="-Pversion=0.PR-$(echo $GITHUB_REF | cut -d '/' -f 3)"
           fi
-          echo "$GRADLE_ARGS"
-          #./gradlew "$GRADLE_ARGS" check publishAllPublicationsToGitHubPackagesRepository
+          ./gradlew "$GRADLE_ARGS" check publishAllPublicationsToGitHubPackagesRepository
         env:
           USERNAME: ${{ github.actor }}
           TOKEN: ${{ secrets.GITHUB_TOKEN }}