From c5a9268d9c0f49a41546348d2053ab273110d4ae Mon Sep 17 00:00:00 2001
From: Tanzeel Khan <140405735+tanscorpio7@users.noreply.github.com>
Date: Mon, 23 Dec 2024 21:10:34 +0530
Subject: [PATCH] Bump version of maven commons-io and github actions (#3301)
This PR contains the following changes
Bump version of maven commons-io from 2.7 to 2.14
Replace uses of set output command in github actions with >> $GITHUB_OUTPUT
------------
Signed-off-by: Tanzeel Khan tzlkhan@amazon.com
---
.../check-babelfish-inconsistency/action.yml | 2 +-
.../major-version-upgrade-util/action.yml | 4 ++--
.../minor-version-upgrade-util/action.yml | 4 ++--
.../setup-base-version/action.yml | 4 ++--
...ests-with-non-default-server-collation.yml | 2 +-
.../jdbc-tests-with-parallel-query.yml | 2 +-
.github/workflows/jdbc-tests.yml | 2 +-
.github/workflows/major-version-upgrade.yml | 2 +-
.github/workflows/minor-version-upgrade.yml | 2 +-
.github/workflows/upgrade-test.yml | 20 +++++++++----------
test/JDBC/pom.xml | 2 +-
11 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/.github/composite-actions/check-babelfish-inconsistency/action.yml b/.github/composite-actions/check-babelfish-inconsistency/action.yml
index e4c6215b4f..fc9ca08a01 100644
--- a/.github/composite-actions/check-babelfish-inconsistency/action.yml
+++ b/.github/composite-actions/check-babelfish-inconsistency/action.yml
@@ -12,7 +12,7 @@ runs:
FROM pg_proc
WHERE proname = 'check_for_inconsistent_metadata';" | grep -o 'exists\|not_exists')
- echo "::set-output name=function_exists::$function_exists"
+ echo "function_exists=$function_exists" >> $GITHUB_OUTPUT
echo "Check Babelfish metadata inconsistency function exists: $function_exists"
# If the function exists, run the metadata inconsistency check
diff --git a/.github/composite-actions/major-version-upgrade-util/action.yml b/.github/composite-actions/major-version-upgrade-util/action.yml
index 2c3fdcfc2e..2b27448714 100644
--- a/.github/composite-actions/major-version-upgrade-util/action.yml
+++ b/.github/composite-actions/major-version-upgrade-util/action.yml
@@ -102,13 +102,13 @@ runs:
base_dir="singledb"
export inputFilesPath=upgrade/singledb/verification_cleanup
fi
- mvn test
+ mvn -B -ntp test
export inputFilesPath=input
for filename in $(grep -v "^ignore.*\|^#.*\|^cmd.*\|^all.*\|^$" upgrade/$base_dir/schedule); do
sed -i "s/$filename[ ]*$/$filename-vu-verify\\n$filename-vu-cleanup/g" upgrade/$base_dir/schedule
done
export scheduleFile=upgrade/$base_dir/schedule
- mvn test
+ mvn -B -ntp test
shell: bash
- name: Cleanup babelfish database
diff --git a/.github/composite-actions/minor-version-upgrade-util/action.yml b/.github/composite-actions/minor-version-upgrade-util/action.yml
index 6f3433d226..7b5a5e5aa0 100644
--- a/.github/composite-actions/minor-version-upgrade-util/action.yml
+++ b/.github/composite-actions/minor-version-upgrade-util/action.yml
@@ -78,13 +78,13 @@ runs:
tar_dir="latest"
fi
export inputFilesPath=upgrade/$tar_dir/verification_cleanup/$base_dir
- mvn test
+ mvn -B -ntp test
export inputFilesPath=input
for filename in $(grep -v "^ignore.*\|^#.*\|^cmd.*\|^all.*\|^$" upgrade/$base_dir/schedule); do
sed -i "s/$filename[ ]*$/$filename-vu-verify\\n$filename-vu-cleanup/g" upgrade/$base_dir/schedule
done
export scheduleFile=upgrade/$base_dir/schedule
- mvn test
+ mvn -B -ntp test
shell: bash
\ No newline at end of file
diff --git a/.github/composite-actions/setup-base-version/action.yml b/.github/composite-actions/setup-base-version/action.yml
index 03ad9c2ad0..9aa9de8b98 100644
--- a/.github/composite-actions/setup-base-version/action.yml
+++ b/.github/composite-actions/setup-base-version/action.yml
@@ -110,7 +110,7 @@ runs:
base_dir="singledb"
fi
export inputFilesPath=upgrade/$base_dir/preparation
- mvn test
+ mvn -B -ntp test
for filename in $(grep -v "^ignore.*\|^#.*\|^cmd.*\|^all.*\|^$" upgrade/$base_dir/schedule); do
if [[ ! ($(find input/ -name $filename"-vu-prepare.*") || $(find input/ -name $filename"-vu-verify.*")) ]]; then
printf '%s\n' "ERROR: Cannot find Test file "$filename"-vu-prepare or "$filename"-vu-verify in input directory !!" >&2
@@ -123,7 +123,7 @@ runs:
sed -i "s/$filename[ ]*$/$filename-vu-prepare/g" upgrade/$base_dir/schedule
done
export scheduleFile=upgrade/$base_dir/schedule
- mvn test
+ mvn -B -ntp test
shell: bash
- name: Install Python
diff --git a/.github/workflows/jdbc-tests-with-non-default-server-collation.yml b/.github/workflows/jdbc-tests-with-non-default-server-collation.yml
index 6886596f06..b6fb4876a0 100644
--- a/.github/workflows/jdbc-tests-with-non-default-server-collation.yml
+++ b/.github/workflows/jdbc-tests-with-non-default-server-collation.yml
@@ -46,7 +46,7 @@ jobs:
cd test/JDBC/
# set env variable serverCollationName to current server collation name
export serverCollationName=${{ env.SERVER_COLLATION_NAME }}
- mvn test
+ mvn -B -ntp test
# reset env variable
unset serverCollationName
diff --git a/.github/workflows/jdbc-tests-with-parallel-query.yml b/.github/workflows/jdbc-tests-with-parallel-query.yml
index e69826d42c..b94d5277bc 100644
--- a/.github/workflows/jdbc-tests-with-parallel-query.yml
+++ b/.github/workflows/jdbc-tests-with-parallel-query.yml
@@ -43,7 +43,7 @@ jobs:
cd test/JDBC/
# set env variable isParallelQueryMode to true to let jdbc know not to run tests of file parallel_query_jdbc_schedule
export isParallelQueryMode=true
- mvn test
+ mvn -B -ntp test
# reset env variable
unset isParallelQueryMode
diff --git a/.github/workflows/jdbc-tests.yml b/.github/workflows/jdbc-tests.yml
index baee94895c..3105f090e9 100644
--- a/.github/workflows/jdbc-tests.yml
+++ b/.github/workflows/jdbc-tests.yml
@@ -39,7 +39,7 @@ jobs:
timeout-minutes: 60
run: |
cd test/JDBC/
- mvn test
+ mvn -B -ntp test
- name: Cleanup babelfish database
id: cleanup
diff --git a/.github/workflows/major-version-upgrade.yml b/.github/workflows/major-version-upgrade.yml
index e2a2764c67..522e51efbe 100644
--- a/.github/workflows/major-version-upgrade.yml
+++ b/.github/workflows/major-version-upgrade.yml
@@ -132,7 +132,7 @@ jobs:
cd test/JDBC/
# temporarily ignore test BABEL-2086
echo 'ignore#!#BABEL-2086' >> jdbc_schedule
- mvn test
+ mvn -B -ntp test
- name: Upload Postgres log
if: always() && steps.jdbc.outcome == 'failure'
diff --git a/.github/workflows/minor-version-upgrade.yml b/.github/workflows/minor-version-upgrade.yml
index 5a3a2e3779..cad2f6a5ff 100644
--- a/.github/workflows/minor-version-upgrade.yml
+++ b/.github/workflows/minor-version-upgrade.yml
@@ -70,7 +70,7 @@ jobs:
timeout-minutes: 60
run: |
cd test/JDBC/
- mvn test
+ mvn -B -ntp test
- name: Upload Log
if: always() && steps.jdbc.outcome == 'failure'
diff --git a/.github/workflows/upgrade-test.yml b/.github/workflows/upgrade-test.yml
index 15dc7e1904..034373b757 100644
--- a/.github/workflows/upgrade-test.yml
+++ b/.github/workflows/upgrade-test.yml
@@ -16,7 +16,7 @@ jobs:
config="'$(yq -o=json ${{ github.workspace }}/.github/configuration/upgrade-test-configuration.yml)'"
config=$(echo $config | sed "s/\"/\\\\\"/g")
UPGRADE_PATH_LIST=$(node -e "let k = JSON.parse($config); let p = k['upgrade-version'].map((itm, index) => ({ id: index, path: itm['upgrade-path'].map(i => i.version.toString().replace(/[.]/g, \"_\")), server_collation_name: itm['babelfishpg_tsql_server_collation_name'] ? itm['babelfishpg_tsql_server_collation_name'] : \"default\", title: itm['upgrade-path'].map(i => i.version.toString().replace(/[.]/g, \"_\")).join(\"-\") + (itm['babelfishpg_tsql_server_collation_name'] ? (\" with server-collation - \" + itm['babelfishpg_tsql_server_collation_name'] + \" \") : \"\"), last_version: itm['upgrade-path'][itm['upgrade-path'].length - 1].version.toString().replace(/[.]/g, \"_\") })); console.log(JSON.stringify(p));")
- echo "::set-output name=upgrade-path-list::$UPGRADE_PATH_LIST"
+ echo "upgrade-path-list=$UPGRADE_PATH_LIST" >> $GITHUB_OUTPUT
run-version-upgrade-test:
needs: generate-version-upgrade-tests
@@ -38,24 +38,24 @@ jobs:
id: read-base-and-final-version
if: always() && steps.install-yq.outcome == 'success'
run: >
- echo "::set-output name=base-version::$(
+ echo "base-version=$(
yq '."upgrade-version"[${{ matrix.upgrade-path.id }}]."upgrade-path"[0].version' ${{ github.workspace }}/.github/configuration/upgrade-test-configuration.yml
- )" &&
- echo "::set-output name=final-version::$(
+ )" >> $GITHUB_OUTPUT &&
+ echo "final-version=$(
yq '."upgrade-version"[${{ matrix.upgrade-path.id }}]."upgrade-path"[-1].version' ${{ github.workspace }}/.github/configuration/upgrade-test-configuration.yml
- )"
+ )" >> $GITHUB_OUTPUT
- name: Find Engine and Extension Branches for Base Version ${{ steps.read-base-and-final-version.outputs.base-version }}
id: find-branch
if: always() && steps.read-base-and-final-version.outcome == 'success'
run: >
- echo "::set-output name=base-engine-branch::$(
+ echo "base-engine-branch=$(
yq '."${{ steps.read-base-and-final-version.outputs.base-version }}".engine_branch' ${{ github.workspace }}/.github/template/version-branch-template.yml
- )" &&
- echo "::set-output name=base-extension-branch::$(
+ )" >> $GITHUB_OUTPUT &&
+ echo "base-extension-branch=$(
yq '."${{ steps.read-base-and-final-version.outputs.base-version }}".extension_branch' ${{ github.workspace }}/.github/template/version-branch-template.yml
- )" &&
- echo "::set-output name=base-dir::$(echo postgres$(awk -F. '{print $1}' <<< ${{ steps.read-base-and-final-version.outputs.base-version }}))"
+ )" >> $GITHUB_OUTPUT &&
+ echo "base-dir=$(echo postgres$(awk -F. '{print $1}' <<< ${{ steps.read-base-and-final-version.outputs.base-version }}))" >> $GITHUB_OUTPUT
- name: Setup Base Version ${{ steps.read-base-and-final-version.outputs.base-version }} and Run Preparation Tests
id: setup-base-version
diff --git a/test/JDBC/pom.xml b/test/JDBC/pom.xml
index 57599c87ee..16d931c4c7 100644
--- a/test/JDBC/pom.xml
+++ b/test/JDBC/pom.xml
@@ -22,7 +22,7 @@
commons-io
commons-io
- 2.7
+ 2.14.0
org.apache.commons