From 2893cf4b4b25321584a982948f44644c6ff3a149 Mon Sep 17 00:00:00 2001 From: kagahd Date: Mon, 14 Oct 2024 13:48:46 +0200 Subject: [PATCH 1/5] test PR --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 1032cbc..9a30a1b 100644 --- a/pom.xml +++ b/pom.xml @@ -99,4 +99,5 @@ 1.9.0 + \ No newline at end of file From 8978abcde6efe4baf841666b1e8c88e075ef446d Mon Sep 17 00:00:00 2001 From: kagahd Date: Mon, 14 Oct 2024 14:04:13 +0200 Subject: [PATCH 2/5] push orgin --- .github/workflows/build-jar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-jar.yml b/.github/workflows/build-jar.yml index 0d1eee3..01c4183 100644 --- a/.github/workflows/build-jar.yml +++ b/.github/workflows/build-jar.yml @@ -48,7 +48,7 @@ jobs: echo "The [latest-version/mongodb-performance-test.jar](https://github.com/idealo/mongodb-performance-test/tree/master/latest-version/mongodb-performance-test.jar) is unchanged" >> $GITHUB_STEP_SUMMARY else git commit -m "Add latest version ($VERSION) of mongodb-performance-test.jar" - git push + git push origin HEAD:${{ github.head_ref }} # Delete the local tag if it exists git tag -d "v$VERSION" || true # Ignore if the tag doesn't exist From 457bc3d315456425d33a6826955f11ba24cd6a17 Mon Sep 17 00:00:00 2001 From: kagahd Date: Mon, 14 Oct 2024 14:07:37 +0200 Subject: [PATCH 3/5] git pull --- .github/workflows/build-jar.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-jar.yml b/.github/workflows/build-jar.yml index 01c4183..f366c30 100644 --- a/.github/workflows/build-jar.yml +++ b/.github/workflows/build-jar.yml @@ -48,6 +48,7 @@ jobs: echo "The [latest-version/mongodb-performance-test.jar](https://github.com/idealo/mongodb-performance-test/tree/master/latest-version/mongodb-performance-test.jar) is unchanged" >> $GITHUB_STEP_SUMMARY else git commit -m "Add latest version ($VERSION) of mongodb-performance-test.jar" + git pull origin ${{ github.head_ref }} --rebase git push origin HEAD:${{ github.head_ref }} # Delete the local tag if it exists From e1d23f8d07e132d0debf0f8fe655d4f5b160894e Mon Sep 17 00:00:00 2001 From: kagahd Date: Mon, 14 Oct 2024 14:11:49 +0200 Subject: [PATCH 4/5] condition --- .github/workflows/build-jar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-jar.yml b/.github/workflows/build-jar.yml index f366c30..6dff392 100644 --- a/.github/workflows/build-jar.yml +++ b/.github/workflows/build-jar.yml @@ -40,6 +40,7 @@ jobs: git config --local user.email "github-actions@idealo.de" git config --local user.name "github-actions[bot]" + git pull origin ${{ github.head_ref }} --rebase || echo "No changes to pull" git add latest-version/mongodb-performance-test.jar # Check if there are staged changes @@ -48,7 +49,6 @@ jobs: echo "The [latest-version/mongodb-performance-test.jar](https://github.com/idealo/mongodb-performance-test/tree/master/latest-version/mongodb-performance-test.jar) is unchanged" >> $GITHUB_STEP_SUMMARY else git commit -m "Add latest version ($VERSION) of mongodb-performance-test.jar" - git pull origin ${{ github.head_ref }} --rebase git push origin HEAD:${{ github.head_ref }} # Delete the local tag if it exists From 341dea34241a97e7d5ef8a1ff739a40a08f22986 Mon Sep 17 00:00:00 2001 From: kagahd Date: Mon, 14 Oct 2024 14:15:16 +0200 Subject: [PATCH 5/5] no HEAD --- .github/workflows/build-jar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-jar.yml b/.github/workflows/build-jar.yml index 6dff392..cc541dc 100644 --- a/.github/workflows/build-jar.yml +++ b/.github/workflows/build-jar.yml @@ -49,7 +49,7 @@ jobs: echo "The [latest-version/mongodb-performance-test.jar](https://github.com/idealo/mongodb-performance-test/tree/master/latest-version/mongodb-performance-test.jar) is unchanged" >> $GITHUB_STEP_SUMMARY else git commit -m "Add latest version ($VERSION) of mongodb-performance-test.jar" - git push origin HEAD:${{ github.head_ref }} + git push origin ${{ github.head_ref }} # Delete the local tag if it exists git tag -d "v$VERSION" || true # Ignore if the tag doesn't exist