Skip to content

Commit 960ef55

Browse files
committed
Make bwc increments on X.Y and main branches.
Signed-off-by: dblock <dblock@amazon.com>
1 parent 97ccee9 commit 960ef55

File tree

1 file changed

+44
-1
lines changed

1 file changed

+44
-1
lines changed

.github/workflows/version.yml

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
TAG=$(echo "${GITHUB_REF#refs/*/}")
1818
CURRENT_VERSION_ARRAY=($(echo "$TAG" | tr . '\n'))
1919
BASE=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:2}")
20+
BASE_X=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:1}.x")
2021
CURRENT_VERSION=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:3}")
2122
CURRENT_VERSION_UNDERSCORE=$(IFS=_ ; echo "V_${CURRENT_VERSION_ARRAY[*]:0:3}")
2223
CURRENT_VERSION_ARRAY[2]=$((CURRENT_VERSION_ARRAY[2]+1))
@@ -25,6 +26,7 @@ jobs:
2526
NEXT_VERSION_ID=$(IFS=0 ; echo "${CURRENT_VERSION_ARRAY[*]:0:3}99")
2627
echo "TAG=$TAG" >> $GITHUB_ENV
2728
echo "BASE=$BASE" >> $GITHUB_ENV
29+
echo "BASE_X=$BASE_X" >> $GITHUB_ENV
2830
echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
2931
echo "CURRENT_VERSION_UNDERSCORE=$CURRENT_VERSION_UNDERSCORE" >> $GITHUB_ENV
3032
echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_ENV
@@ -33,7 +35,7 @@ jobs:
3335
- uses: actions/checkout@v2
3436
with:
3537
ref: ${{ env.BASE }}
36-
- name: Increment Version
38+
- name: Increment Patch Version
3739
run: |
3840
echo Incrementing $CURRENT_VERSION to $NEXT_VERSION
3941
echo " - \"$CURRENT_VERSION\"" >> .ci/bwcVersions
@@ -45,8 +47,49 @@ jobs:
4547
uses: peter-evans/create-pull-request@v3
4648
with:
4749
base: ${{ env.BASE }}
50+
branch: 'create-pull-request/patch-${{ env.BASE }}'
4851
commit-message: Incremented version to ${{ env.NEXT_VERSION }}
4952
delete-branch: true
5053
title: '[AUTO] Incremented version to ${{ env.NEXT_VERSION }}.'
5154
body: |
5255
I've noticed that a new tag ${{ env.TAG }} was pushed, and incremented the version from ${{ env.CURRENT_VERSION }} to ${{ env.NEXT_VERSION }}.
56+
57+
- uses: actions/checkout@v2
58+
with:
59+
ref: ${{ env.BASE_X }}
60+
- name: Add bwc version to .X branch
61+
run: |
62+
echo Adding bwc version $NEXT_VERSION after $CURRENT_VERSION
63+
sed -i "s/- \"$CURRENT_VERSION\"/\0\n - \"$NEXT_VERSION\"/g" .ci/bwcVersions
64+
echo Adding $NEXT_VERSION_UNDERSCORE after $CURRENT_VERSION_UNDERSCORE
65+
sed -i "s/public static final Version $CURRENT_VERSION_UNDERSCORE = new Version(\([[:digit:]]\+\)\(.*\));/\0\n public static final Version $NEXT_VERSION_UNDERSCORE = new Version($NEXT_VERSION_ID\2);/g" server/src/main/java/org/opensearch/Version.java
66+
- name: Create Pull Request
67+
uses: peter-evans/create-pull-request@v3
68+
with:
69+
base: ${{ env.BASE_X }}
70+
branch: 'create-pull-request/patch-${{ env.BASE_X }}'
71+
commit-message: Added bwc version ${{ env.NEXT_VERSION }}
72+
delete-branch: true
73+
title: '[AUTO] [${{ env.BASE_X }}] Added bwc version ${{ env.NEXT_VERSION }}.'
74+
body: |
75+
I've noticed that a new tag ${{ env.TAG }} was pushed, and added a bwc version ${{ env.NEXT_VERSION }}.
76+
77+
- uses: actions/checkout@v2
78+
with:
79+
ref: main
80+
- name: Add bwc version to main branch
81+
run: |
82+
echo Adding bwc version $NEXT_VERSION after $CURRENT_VERSION
83+
sed -i "s/- \"$CURRENT_VERSION\"/\0\n - \"$NEXT_VERSION\"/g" .ci/bwcVersions
84+
echo Adding $NEXT_VERSION_UNDERSCORE after $CURRENT_VERSION_UNDERSCORE
85+
sed -i "s/public static final Version $CURRENT_VERSION_UNDERSCORE = new Version(\([[:digit:]]\+\)\(.*\));/\0\n public static final Version $NEXT_VERSION_UNDERSCORE = new Version($NEXT_VERSION_ID\2);/g" server/src/main/java/org/opensearch/Version.java
86+
- name: Create Pull Request
87+
uses: peter-evans/create-pull-request@v3
88+
with:
89+
base: main
90+
branch: 'create-pull-request/patch-main'
91+
commit-message: Added bwc version ${{ env.NEXT_VERSION }}
92+
delete-branch: true
93+
title: '[AUTO] [main] Added bwc version ${{ env.NEXT_VERSION }}.'
94+
body: |
95+
I've noticed that a new tag ${{ env.TAG }} was pushed, and added a bwc version ${{ env.NEXT_VERSION }}.

0 commit comments

Comments
 (0)