From 1214b5bc1875331b646b86591b8ccb0b0bfa5bb0 Mon Sep 17 00:00:00 2001 From: Devesh-Skyflow Date: Wed, 27 May 2026 18:06:12 +0530 Subject: [PATCH 1/3] chore: set version to 1.15.0 Co-Authored-By: Claude Sonnet 4.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a478ab04..a3ee8f0d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.skyflow skyflow-java - 1.15.1 + 1.15.0 jar ${project.groupId}:${project.artifactId} From 66ce7f6adc71a92e33d1ad75a66ef3b00d3197d4 Mon Sep 17 00:00:00 2001 From: Devesh-Skyflow Date: Wed, 27 May 2026 18:26:31 +0530 Subject: [PATCH 2/3] fix: remove tag trigger from internal release workflow Internal (JFrog) releases should only trigger on branch pushes, not tags. Tags are reserved for public Maven Central releases. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/internal-release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/internal-release.yml b/.github/workflows/internal-release.yml index 1e26a801..b77d32d6 100644 --- a/.github/workflows/internal-release.yml +++ b/.github/workflows/internal-release.yml @@ -1,7 +1,6 @@ name: Publish package to the JFROG Artifactory on: push: - tags: '*.*.*' paths-ignore: - "pom.xml" - "*.md" From 6197f98bfed26c0174bc9208aec5a9406dfdff74 Mon Sep 17 00:00:00 2001 From: Devesh-Skyflow Date: Fri, 29 May 2026 09:13:06 +0530 Subject: [PATCH 3/3] fix: resolve detached HEAD push failure in v1 public release Add target-branch input to shared workflow so the post-release pom.xml commit is pushed to the correct branch (v1 for 1.x.x tags, main for others) instead of failing with 'not on a branch' error. Co-Authored-By: Claude Sonnet 4.6 (1M context) --- .github/workflows/internal-release.yml | 2 +- .github/workflows/release-v1.yml | 19 +++++++++++++++++++ .github/workflows/release.yml | 4 +++- .github/workflows/shared-build-and-deploy.yml | 8 +++++++- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/release-v1.yml diff --git a/.github/workflows/internal-release.yml b/.github/workflows/internal-release.yml index b77d32d6..86562777 100644 --- a/.github/workflows/internal-release.yml +++ b/.github/workflows/internal-release.yml @@ -5,7 +5,7 @@ on: - "pom.xml" - "*.md" branches: - - release/* + - release/** jobs: build-and-deploy: diff --git a/.github/workflows/release-v1.yml b/.github/workflows/release-v1.yml new file mode 100644 index 00000000..1646bea0 --- /dev/null +++ b/.github/workflows/release-v1.yml @@ -0,0 +1,19 @@ +name: Publish v1 package to the Maven Central Repository +on: + push: + tags: + - '1.*.*' +jobs: + build-and-deploy: + uses: ./.github/workflows/shared-build-and-deploy.yml + with: + ref: ${{ github.ref_name }} + is-internal: false + target-branch: v1 + server-id: ossrh + profile: maven-central + secrets: + server-username: ${{ secrets.OSSRH_USERNAME }} + server-password: ${{ secrets.OSSRH_PASSWORD }} + gpg-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + gpg-passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f978c067..1829c6f5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,13 +1,15 @@ name: Publish package to the Maven Central Repository on: push: - tags: '*.*.*' + tags: + - '[2-9]*.*.*' jobs: build-and-deploy: uses: ./.github/workflows/shared-build-and-deploy.yml with: ref: ${{ github.ref_name }} is-internal: false + target-branch: main server-id: ossrh profile: maven-central secrets: diff --git a/.github/workflows/shared-build-and-deploy.yml b/.github/workflows/shared-build-and-deploy.yml index 22456b4c..8db92b09 100644 --- a/.github/workflows/shared-build-and-deploy.yml +++ b/.github/workflows/shared-build-and-deploy.yml @@ -7,6 +7,12 @@ on: required: true type: string + target-branch: + description: 'Branch to push the version bump commit back to' + required: false + type: string + default: 'main' + is-internal: description: 'Flag for internal release' required: true @@ -79,7 +85,7 @@ jobs: git push origin ${{ github.ref_name }} -f else git commit -m "[AUTOMATED] Public Release - ${{ steps.previoustag.outputs.tag }}" - git push origin + git push origin HEAD:${{ inputs.target-branch }} fi - name: Create env