mirror of https://github.com/citusdata/citus.git
Removes urllib changes
parent
b5b86c054b
commit
4084524ab7
|
@ -32,11 +32,6 @@ python3 -m pip install -r tools/packaging_automation/requirements.txt
|
||||||
echo "Package type: ${package_type}"
|
echo "Package type: ${package_type}"
|
||||||
echo "OS version: $(get_rpm_os_version)"
|
echo "OS version: $(get_rpm_os_version)"
|
||||||
|
|
||||||
# if os version is centos 7 or oracle linux 7, then remove urllib3 with pip uninstall and install urllib3<2.0.0 with pip install
|
|
||||||
if [[ ${package_type} == "rpm" && $(get_rpm_os_version) == 7* ]]; then
|
|
||||||
python3 -m pip uninstall -y urllib3
|
|
||||||
python3 -m pip install 'urllib3<2'
|
|
||||||
fi
|
|
||||||
|
|
||||||
python3 -m tools.packaging_automation.validate_build_output --output_file output.log \
|
python3 -m tools.packaging_automation.validate_build_output --output_file output.log \
|
||||||
--ignore_file .github/packaging/packaging_ignore.yml \
|
--ignore_file .github/packaging/packaging_ignore.yml \
|
||||||
|
|
|
@ -112,7 +112,6 @@ jobs:
|
||||||
PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }}
|
PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }}
|
||||||
run: |
|
run: |
|
||||||
echo "Postgres version: ${POSTGRES_VERSION}"
|
echo "Postgres version: ${POSTGRES_VERSION}"
|
||||||
|
|
||||||
./.github/packaging/validate_build_output.sh "rpm"
|
./.github/packaging/validate_build_output.sh "rpm"
|
||||||
|
|
||||||
deb_build_tests:
|
deb_build_tests:
|
||||||
|
@ -188,6 +187,4 @@ jobs:
|
||||||
PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }}
|
PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }}
|
||||||
run: |
|
run: |
|
||||||
echo "Postgres version: ${POSTGRES_VERSION}"
|
echo "Postgres version: ${POSTGRES_VERSION}"
|
||||||
|
|
||||||
apt-get update -y
|
|
||||||
./.github/packaging/validate_build_output.sh "deb"
|
./.github/packaging/validate_build_output.sh "deb"
|
||||||
|
|
Loading…
Reference in New Issue