Skip to content

Commit

Permalink
[OSS-ONLY] Update version and upgrade-test-configuration (#3151)
Browse files Browse the repository at this point in the history
* Update versions from 14.15, 15.10 and 16.5 to 14.16, 15.11 and 16.6 respectively in upgrade-test-configuration.
* Rename 14_14/schedule file to 14_16/schedule, 15_9/schedule file to 15_11/schedule and 16_5/schedule file to 16_6/schedule.
* Build ANTLR from 16.7 onwards.

Task: OSS-ONLY
Signed-off-by: Rishabh Tanwar <[email protected]>
  • Loading branch information
rishabhtanwar29 authored and ritanwar committed Nov 25, 2024
1 parent f7f045f commit 5a82d06
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/composite-actions/setup-dump-restore-ca/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ runs:
is_final_ver=false; [[ i -eq $LEN-1 ]] && is_final_ver=true
pg_old_dir=$(echo psql$(awk -F. '{print $1}' <<< $previous_installed_version))
pg_new_dir=$(echo psql$(awk -F. '{print $1}' <<< $dump_restore_version))
if [[ "$dump_restore_version" == 'target.latest' || "$dump_restore_version" -ge 16.6 ]]
if [[ "$dump_restore_version" == 'target.latest' || "$dump_restore_version" -ge 16.7 ]]
then
antlr_version=4.13.2
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ runs:
is_final_ver=false; [[ i -eq $LEN-1 ]] && is_final_ver=true
pg_old_dir=$(echo psql$(awk -F. '{print $1}' <<< $previous_installed_version))
pg_new_dir=$(echo psql$(awk -F. '{print $1}' <<< $upgrade_version))
if [[ "$upgrade_version" == 'target.latest' || "$upgrade_version" -ge 16.6 ]]
if [[ "$upgrade_version" == 'target.latest' || "$upgrade_version" -ge 16.7 ]]
then
antlr_version=4.13.2
else
Expand Down
16 changes: 8 additions & 8 deletions .github/configuration/upgrade-test-configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ upgrade-version: [{
{
upgrade-path: [
{
version: '14.15',
version: '14.16',
upgrade-type: null
},
{
Expand All @@ -125,7 +125,7 @@ upgrade-version: [{
{
upgrade-path: [
{
version: 15.9,
version: '15.10',
upgrade-type: null
},
{
Expand Down Expand Up @@ -161,7 +161,7 @@ upgrade-version: [{
{
upgrade-path: [
{
version: 16.5,
version: 16.6,
upgrade-type: null
},
{
Expand All @@ -177,11 +177,11 @@ upgrade-version: [{
upgrade-type: null
},
{
version: '14.15',
version: '14.16',
upgrade-type: major
},
{
version: '15.10',
version: '15.11',
upgrade-type: major
},
{
Expand All @@ -207,7 +207,7 @@ upgrade-version: [{
{
upgrade-path: [
{
version: '15.10',
version: '15.11',
upgrade-type: null
},
{
Expand All @@ -220,7 +220,7 @@ upgrade-version: [{
{
upgrade-path: [
{
version: '15.10',
version: '15.11',
upgrade-type: null
},
{
Expand All @@ -237,7 +237,7 @@ upgrade-version: [{
upgrade-type: null
},
{
version: '15.10',
version: '15.11',
upgrade-type: minor
},
{
Expand Down
16 changes: 8 additions & 8 deletions .github/template/version-branch-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
'14.13':
engine_branch: BABEL_2_10_STABLE__PG_14_13
extension_branch: BABEL_2_10_STABLE
'14.14':
engine_branch: BABEL_2_11_STABLE__PG_14_14
extension_branch: BABEL_2_11_STABLE
'14.15':
engine_branch: BABEL_2_11_STABLE__PG_14_15
extension_branch: BABEL_2_11_STABLE
'14.16':
engine_branch: BABEL_2_X_DEV__PG_14_X
extension_branch: BABEL_2_X_DEV
'15.2':
Expand All @@ -73,10 +73,10 @@
'15.8':
engine_branch: BABEL_3_7_STABLE__PG_15_8
extension_branch: BABEL_3_7_STABLE
'15.9':
engine_branch: BABEL_3_8_STABLE__PG_15_9
extension_branch: BABEL_3_8_STABLE
'15.10':
engine_branch: BABEL_3_8_STABLE__PG_15_10
extension_branch: BABEL_3_8_STABLE
'15.11':
engine_branch: BABEL_3_X_DEV__PG_15_X
extension_branch: BABEL_3_X_DEV
'16.1':
Expand All @@ -91,8 +91,8 @@
'16.4':
engine_branch: BABEL_4_3_STABLE__PG_16_4
extension_branch: BABEL_4_3_STABLE
'16.5':
engine_branch: BABEL_4_4_STABLE__PG_16_5
'16.6':
engine_branch: BABEL_4_4_STABLE__PG_16_6
extension_branch: BABEL_4_4_STABLE
'source.latest':
engine_branch: latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pg_dump-restore-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
install_dir: ${{ steps.find-branch.outputs.base-dir }}
migration_mode: 'multi-db'
dump_restore: 'true'
antlr_version: ${{ (steps.read-base-and-final-version.outputs.base-version == 'source.latest' || fromJSON(steps.read-base-and-final-version.outputs.base-version) >= 16.6 ) && '4.13.2' || '4.9.3' }}
antlr_version: ${{ (steps.read-base-and-final-version.outputs.base-version == 'source.latest' || fromJSON(steps.read-base-and-final-version.outputs.base-version) >= 16.7 ) && '4.13.2' || '4.9.3' }}

- name: Setup Dump Restore Composite Action
id: setup-dump-restore-ca
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
install_dir: ${{ steps.find-branch.outputs.base-dir }}
migration_mode: 'multi-db'
server_collation_name: ${{ matrix.upgrade-path.server_collation_name }}
antlr_version: ${{ (steps.read-base-and-final-version.outputs.base-version == 'source.latest' || fromJSON(steps.read-base-and-final-version.outputs.base-version) >= 16.6 ) && '4.13.2' || '4.9.3' }}
antlr_version: ${{ (steps.read-base-and-final-version.outputs.base-version == 'source.latest' || fromJSON(steps.read-base-and-final-version.outputs.base-version) >= 16.7 ) && '4.13.2' || '4.9.3' }}

- name: Setup Upgrade Version Composite Action
id: setup-upgrade-ver-ca
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 5a82d06

Please sign in to comment.