From ce72d199f90893a8108c620530d79da2ed7b4503 Mon Sep 17 00:00:00 2001 From: Lennon Scariano Date: Fri, 15 May 2026 12:30:24 -0400 Subject: [PATCH 1/2] remove duplicates --- .github/workflows/gradle_publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle_publish.yml b/.github/workflows/gradle_publish.yml index 0718d58eb..94779c39e 100644 --- a/.github/workflows/gradle_publish.yml +++ b/.github/workflows/gradle_publish.yml @@ -33,7 +33,7 @@ jobs: CHANGED=${{ inputs.run_specific }} fi else #merge to master, detect specific changes - CHANGED=$(grep -F -o -f <(echo "$CHANGED") <(git diff --name-only HEAD~ HEAD)) + CHANGED=$(grep -F -o -f <(echo "$CHANGED") <(git diff --name-only HEAD~ HEAD) | sort -u) fi CHANGED=$(echo -n "$CHANGED" | base64 -w 0) From 699caec992abf01c7998ae3a9bd4e636781be777 Mon Sep 17 00:00:00 2001 From: Lennon Scariano Date: Fri, 15 May 2026 12:47:40 -0400 Subject: [PATCH 2/2] fix snapshots not building --- .github/workflows/gradle_publish.yml | 6 +++--- build.gradle | 4 ++++ gradle.properties | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle_publish.yml b/.github/workflows/gradle_publish.yml index 94779c39e..6573f874e 100644 --- a/.github/workflows/gradle_publish.yml +++ b/.github/workflows/gradle_publish.yml @@ -62,9 +62,9 @@ jobs: echo "Publishing ${{ matrix.project }}" VERSION=$(./gradlew --quiet :${{ matrix.project }}:printVersion) if [ "${{ github.event_name }}" = "push" ]; then - VERSION="${VERSION}-SNAPSHOT" + ./gradlew :${{ matrix.project }}:publish -PbuildType="dev" + else + ./gradlew :${{ matrix.project }}:publish fi - ./gradlew :${{ matrix.project }}:build -Pversion="$VERSION" -x test - ./gradlew :${{ matrix.project }}:publish -Pversion="$VERSION" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 969c93948..bc783653d 100644 --- a/build.gradle +++ b/build.gradle @@ -262,6 +262,10 @@ subprojects { dep.exclude group: 'org.vast.opengis' } + if(project.buildType && project.buildType.equals('dev')) { + p.setVersion(p.version + '-SNAPSHOT') + } + p.osgi { manifest { // main info diff --git a/gradle.properties b/gradle.properties index c92008e8a..486cc2ef1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=512m +buildType=release