Skip to content

Commit 7a7ecef

Browse files
committed
[OSS-ONLY] Updated the ubuntu version to ubuntu-latest and updated the repo config
Signed-off-by: Rishabh Tanwar <ritanwar@amazon.com>
1 parent 9e336ce commit 7a7ecef

File tree

25 files changed

+55
-33
lines changed

25 files changed

+55
-33
lines changed

.github/composite-actions/build-extensions/action.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ inputs:
88
description: 'Extension Branch name which needs to checkout first'
99
required: no
1010
default: 'not_specified'
11+
engine_version:
12+
description: 'Engine version'
13+
required: no
14+
default: 'target.latest'
1115

1216
runs:
1317
using: "composite"
@@ -33,5 +37,11 @@ runs:
3337
cd ../babelfishpg_tds
3438
make && make install
3539
cd ../babelfishpg_tsql
40+
41+
if [[ "$engine_version" != 'source.latest' && "$engine_version" != 'target.latest' && "$engine_version" -ge 14.18 ]]
42+
then
43+
export PG_CFLAGS='-fcommon -Wno-misleading-indentation'
44+
fi
45+
3646
make && make install
3747
shell: bash

.github/composite-actions/install-dependencies/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ runs:
44
steps:
55
- name: Install Dependencies
66
run: |
7-
$GITHUB_WORKSPACE/.github/scripts/choose_install_mirror
87
sudo apt clean && sudo apt-get update --fix-missing -y
98
curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
10-
curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
9+
curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
1110
sudo apt-get install uuid-dev openjdk-8-jre libicu-dev libxml2-dev openssl libssl-dev python-dev libossp-uuid-dev libpq-dev cmake pkg-config g++ build-essential bison mssql-tools unixodbc-dev libkrb5-dev
1211
shell: bash

.github/composite-actions/major-version-upgrade-util/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ inputs:
2222
description: "Server collation name"
2323
required: false
2424
default: "default"
25+
engine_version:
26+
description: 'Engine version'
27+
required: no
28+
default: 'target.latest'
2529

2630
runs:
2731
using: "composite"
@@ -47,6 +51,7 @@ runs:
4751
with:
4852
install_dir: ${{ inputs.pg_new_dir }}
4953
extension_branch: ${{ inputs.extension_branch }}
54+
engine_version: ${{ inputs.engine_version }}
5055

5156
- uses: actions/checkout@v2
5257

.github/composite-actions/minor-version-upgrade-util/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ inputs:
1616
description: "Server collation name"
1717
required: false
1818
default: "default"
19+
engine_version:
20+
description: 'Engine version'
21+
required: no
22+
default: 'target.latest'
1923

2024
runs:
2125
using: "composite"
@@ -32,6 +36,7 @@ runs:
3236
with:
3337
install_dir: ${{ inputs.install_dir }}
3438
extension_branch: ${{ inputs.extension_branch }}
39+
engine_version: ${{ inputs.engine_version }}
3540

3641
# Not created and used composite action update-extensions here since, in the previous step it has
3742
# checked out a branch/tag which may not have the updated update-extension composite action

.github/composite-actions/setup-base-version/action.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ inputs:
1616
description: "Server collation name which need to be set in postgresql.conf"
1717
required: false
1818
default: "default"
19+
engine_version:
20+
description: 'Engine version'
21+
required: no
22+
default: 'target.latest'
1923

2024
runs:
2125
using: "composite"
@@ -46,6 +50,7 @@ runs:
4650
with:
4751
install_dir: ${{ inputs.install_dir }}
4852
extension_branch: ${{ inputs.extension_branch }}
53+
engine_version: ${{ inputs.engine_version }}
4954

5055
# Not used composite action install-extension here since, in the previous step it has
5156
# checked out a branch/tag which may not have the updated install-extension composite action
@@ -131,7 +136,7 @@ runs:
131136
if: ${{ matrix.upgrade-path.path[0] == 'source_latest' && steps.jdbc-upgrade-tests.outcome == 'success' }}
132137
uses: actions/setup-python@v2
133138
with:
134-
python-version: 3.7
139+
python-version: 'v3.10'
135140

136141
- name: Configure Python Environment
137142
id: configure-python-environment

.github/composite-actions/setup-upgrade-version-ca/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ runs:
6060
# Appending upgrade step in upgrade-version composite action based on upgrade type
6161
if [[ $upgrade_type == 'major' ]]
6262
then
63-
printf " - name: Upgrade Version to $upgrade_version\n id: upgrade-version-$i\n if: always() $temp\n uses: ${uses_file}\n with: \n engine_branch: ${engine_branch}\n extension_branch: ${extension_branch}\n is_final_ver: ${is_final_ver}\n pg_old_dir: ${pg_old_dir}\n pg_new_dir: ${pg_new_dir}\n migration_mode: 'multi-db'\n server_collation_name: ${{ inputs.server_collation_name }}\n\n" >> $upgrade_version_dir_path/action.yml
63+
printf " - name: Upgrade Version to $upgrade_version\n id: upgrade-version-$i\n if: always() $temp\n uses: ${uses_file}\n with: \n engine_branch: ${engine_branch}\n extension_branch: ${extension_branch}\n is_final_ver: ${is_final_ver}\n pg_old_dir: ${pg_old_dir}\n pg_new_dir: ${pg_new_dir}\n migration_mode: 'multi-db'\n server_collation_name: ${{ inputs.server_collation_name }}\n engine_version: ${upgrade_version}\n\n" >> $upgrade_version_dir_path/action.yml
6464
else
65-
printf " - name: Upgrade Version to $upgrade_version\n id: upgrade-version-$i\n if: always() $temp\n uses: ${uses_file}\n with: \n engine_branch: ${engine_branch}\n extension_branch: ${extension_branch}\n is_final_ver: ${is_final_ver}\n install_dir: ${pg_new_dir}\n server_collation_name: ${{ inputs.server_collation_name }}\n\n" >> $upgrade_version_dir_path/action.yml
65+
printf " - name: Upgrade Version to $upgrade_version\n id: upgrade-version-$i\n if: always() $temp\n uses: ${uses_file}\n with: \n engine_branch: ${engine_branch}\n extension_branch: ${extension_branch}\n is_final_ver: ${is_final_ver}\n install_dir: ${pg_new_dir}\n server_collation_name: ${{ inputs.server_collation_name }}\n engine_version: ${upgrade_version}\n\n" >> $upgrade_version_dir_path/action.yml
6666
fi
6767
6868
previous_installed_version=$upgrade_version

.github/workflows/dotnet-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [push, pull_request]
33

44
jobs:
55
run-babelfish-dotnet-tests:
6-
runs-on: ubuntu-20.04
6+
runs-on: ubuntu-22.04
77
steps:
88
- uses: actions/checkout@v2
99
id: checkout

.github/workflows/isolation-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
isolation-tests:
1010
name: Isolation-Tests
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/checkout@v2
1414
id: checkout
@@ -41,12 +41,12 @@ jobs:
4141
- name: Install Python
4242
uses: actions/setup-python@v2
4343
with:
44-
python-version: 3.7
44+
python-version: 'v3.10'
4545

4646
- name: Configure Python environment
4747
run: |
4848
cd ~
49-
curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
49+
curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
5050
cd ~/work/babelfish_extensions/babelfish_extensions/test/python
5151
sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17 python3-dev
5252
pip3 install pyodbc pymssql==2.2.7 pytest pytest-xdist antlr4-python3-runtime==4.9.3

.github/workflows/jdbc-tests-with-non-default-server-collation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
env:
77
SERVER_COLLATION_NAME: chinese_prc_ci_as
88

9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-22.04
1010
steps:
1111
- uses: actions/checkout@v2
1212
id: checkout

.github/workflows/jdbc-tests-with-parallel-query.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [push, pull_request]
33

44
jobs:
55
run-babelfish-jdbc-tests-with-parallel-query-mode:
6-
runs-on: ubuntu-20.04
6+
runs-on: ubuntu-22.04
77
steps:
88
- uses: actions/checkout@v2
99
id: checkout

0 commit comments

Comments
 (0)