From cb10dadf18f1b6b1d6b5ca658cecf68a77e26d41 Mon Sep 17 00:00:00 2001 From: skyflow-shravan Date: Wed, 20 Nov 2024 16:28:00 +0530 Subject: [PATCH 1/5] SK-1753 auto generate release version in pom.xml --- .github/workflows/internal-release.yml | 7 ++++++- scripts/bump_version.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/internal-release.yml b/.github/workflows/internal-release.yml index 17176e5e..959f0000 100644 --- a/.github/workflows/internal-release.yml +++ b/.github/workflows/internal-release.yml @@ -7,6 +7,8 @@ on: - "*.md" branches: - release/* + pull-request: + - release/* jobs: publish: @@ -30,6 +32,9 @@ jobs: with: fallback: 1.0.0 + - name: Print working directory + run: pwd + - name: Bump Version run: | chmod +x ./scripts/bump_version.sh @@ -58,7 +63,7 @@ jobs: json: ${{ secrets.TEST_CREDENTIALS_FILE_STRING }} - name: Publish package to Jfrog Artifactory - run: mvn clean deploy -P jfrog + run: mvn clean deplo -P jfrog env: JFROG_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} JFROG_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh index 58ab83a5..d729ea63 100755 --- a/scripts/bump_version.sh +++ b/scripts/bump_version.sh @@ -1,7 +1,7 @@ # Input Arguments Version=$1 CommitHash=$2 -PomFile="../pom.xml" +PomFile="$GITHUB_WORKSPACE/pom.xml" if [ -z "$Version" ]; then echo "Error: Version argument is required." From bd1c50275c44b37383b022bbe2a91a3f587be866 Mon Sep 17 00:00:00 2001 From: skyflow-shravan Date: Wed, 20 Nov 2024 16:31:56 +0530 Subject: [PATCH 2/5] SK-1753 auto generate release version in pom.xml --- .github/workflows/internal-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/internal-release.yml b/.github/workflows/internal-release.yml index 959f0000..829f0c29 100644 --- a/.github/workflows/internal-release.yml +++ b/.github/workflows/internal-release.yml @@ -6,9 +6,9 @@ on: - "pom.xml" - "*.md" branches: - - release/* - pull-request: - - release/* + branches: [ release/*, '*' ] + pull_request: + branches: [ release/* ] jobs: publish: From ab0e8a5cd0c76c5be931e5c089e50a45d2d18700 Mon Sep 17 00:00:00 2001 From: skyflow-shravan Date: Wed, 20 Nov 2024 16:38:55 +0530 Subject: [PATCH 3/5] SK-1753 auto generate release version in pom.xml --- .github/workflows/internal-release.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/internal-release.yml b/.github/workflows/internal-release.yml index 829f0c29..b5d40bcc 100644 --- a/.github/workflows/internal-release.yml +++ b/.github/workflows/internal-release.yml @@ -5,10 +5,9 @@ on: paths-ignore: - "pom.xml" - "*.md" - branches: - branches: [ release/*, '*' ] - pull_request: - branches: [ release/* ] + branches: [ release/*, '*' ] + pull_request: + branches: [ release/* ] jobs: publish: From a80636f8823914a55a8ee5c619f1bc80a746c2c8 Mon Sep 17 00:00:00 2001 From: skyflow-shravan Date: Wed, 20 Nov 2024 16:45:43 +0530 Subject: [PATCH 4/5] SK-1753 auto generate release version in pom.xml --- .github/workflows/internal-release.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/internal-release.yml b/.github/workflows/internal-release.yml index b5d40bcc..4fbb156f 100644 --- a/.github/workflows/internal-release.yml +++ b/.github/workflows/internal-release.yml @@ -5,9 +5,8 @@ on: paths-ignore: - "pom.xml" - "*.md" - branches: [ release/*, '*' ] - pull_request: - branches: [ release/* ] + branches: + - release/* jobs: publish: @@ -31,9 +30,6 @@ jobs: with: fallback: 1.0.0 - - name: Print working directory - run: pwd - - name: Bump Version run: | chmod +x ./scripts/bump_version.sh From 483463582eccb83cfa483a65e163a06e9b725086 Mon Sep 17 00:00:00 2001 From: skyflow-shravan Date: Wed, 20 Nov 2024 16:48:06 +0530 Subject: [PATCH 5/5] SK-1753 auto generate release version in pom.xml --- .github/workflows/internal-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/internal-release.yml b/.github/workflows/internal-release.yml index 4fbb156f..17176e5e 100644 --- a/.github/workflows/internal-release.yml +++ b/.github/workflows/internal-release.yml @@ -58,7 +58,7 @@ jobs: json: ${{ secrets.TEST_CREDENTIALS_FILE_STRING }} - name: Publish package to Jfrog Artifactory - run: mvn clean deplo -P jfrog + run: mvn clean deploy -P jfrog env: JFROG_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} JFROG_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}