Skip to content

Commit 96afcdb

Browse files
chore: turn branches release/ into release-
Signed-off-by: Joris Mancini <[email protected]>
1 parent 5dda28c commit 96afcdb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/patch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
4343
- name: Check if release already exists
4444
run: |
45-
if git ls-remote --quiet --exit-code origin refs/heads/release/${{ github.event.inputs.releaseVersion }} >/dev/null 2>&1
45+
if git ls-remote --quiet --exit-code origin refs/heads/release-${{ github.event.inputs.releaseVersion }} >/dev/null 2>&1
4646
then
4747
echo "Release ${{ github.event.inputs.releaseVersion }} already exists, patch will be perfomed"
4848
else
@@ -52,7 +52,7 @@ jobs:
5252
5353
- name: Checkout on existing release branch
5454
run: |
55-
git checkout release/${{ github.event.inputs.releaseVersion }}
55+
git checkout release-${{ github.event.inputs.releaseVersion }}
5656
5757
- name: Extract tag versions
5858
run: |
@@ -104,5 +104,5 @@ jobs:
104104
git add .
105105
git commit -m "Patched release v${{ env.GITHUB_SHORT_VERSION }}"
106106
git tag v${{ env.GITHUB_SHORT_VERSION }}
107-
git push origin release/v${{ env.GITHUB_MAJOR_VERSION }}.${{ env.GITHUB_MINOR_VERSION }}
107+
git push origin release-v${{ env.GITHUB_MAJOR_VERSION }}.${{ env.GITHUB_MINOR_VERSION }}
108108
git push origin v${{ env.GITHUB_SHORT_VERSION }}

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
- name: Check if release already exists
4949
run: |
50-
if git ls-remote --quiet --exit-code origin refs/heads/release/${{ github.event.inputs.releaseVersion }} >/dev/null 2>&1
50+
if git ls-remote --quiet --exit-code origin refs/heads/release-${{ github.event.inputs.releaseVersion }} >/dev/null 2>&1
5151
then
5252
echo "ERROR: Release ${{ github.event.inputs.releaseVersion }} already exists"
5353
exit 1
@@ -57,7 +57,7 @@ jobs:
5757
5858
- name: Checkout with new branch
5959
run: |
60-
git checkout -b release/v${{ env.GITHUB_MAJOR_VERSION }}.${{ env.GITHUB_MINOR_VERSION }} ${{ github.event.inputs.commitSha }}
60+
git checkout -b release-v${{ env.GITHUB_MAJOR_VERSION }}.${{ env.GITHUB_MINOR_VERSION }} ${{ github.event.inputs.commitSha }}
6161
6262
- name: Change Maven version to release version
6363
run: mvn --batch-mode versions:set -DgenerateBackupPoms=false -DnewVersion=${{ env.GITHUB_SHORT_VERSION }}
@@ -90,7 +90,7 @@ jobs:
9090
git add .
9191
git commit -m "Release v${{ env.GITHUB_SHORT_VERSION }}"
9292
git tag v${{ env.GITHUB_SHORT_VERSION }}
93-
git push origin release/v${{ env.GITHUB_MAJOR_VERSION }}.${{ env.GITHUB_MINOR_VERSION }}
93+
git push origin release-v${{ env.GITHUB_MAJOR_VERSION }}.${{ env.GITHUB_MINOR_VERSION }}
9494
git push origin v${{ env.GITHUB_SHORT_VERSION }}
9595
9696
- name: Checkout main

0 commit comments

Comments
 (0)