From 4f9a34408537397c0a567cf45c9eacaf35b088f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrkan=20=C4=B0ndibay?= Date: Tue, 25 Apr 2023 08:28:57 +0300 Subject: [PATCH] Fix packaging test pipelines We had #6737 fix the same issue on main branch, but we need to fix it on release branches as well. As the patch does not really apply to earlier release branches, we just added the fix manually. --- .github/packaging/validate_build_output.sh | 2 +- .github/workflows/packaging-test-pipelines.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/packaging/validate_build_output.sh b/.github/packaging/validate_build_output.sh index 200b1a188..4c5738388 100755 --- a/.github/packaging/validate_build_output.sh +++ b/.github/packaging/validate_build_output.sh @@ -10,7 +10,7 @@ pyenv versions pyenv virtualenv ${PACKAGING_PYTHON_VERSION} packaging_env pyenv activate packaging_env -git clone -b v0.8.24 --depth=1 https://github.com/citusdata/tools.git tools +git clone -b v0.8.25 --depth=1 https://github.com/citusdata/tools.git tools python3 -m pip install -r tools/packaging_automation/requirements.txt python3 -m tools.packaging_automation.validate_build_output --output_file output.log \ --ignore_file .github/packaging/packaging_ignore.yml \ diff --git a/.github/workflows/packaging-test-pipelines.yml b/.github/workflows/packaging-test-pipelines.yml index 0f6813dd8..1f8d9dc26 100644 --- a/.github/workflows/packaging-test-pipelines.yml +++ b/.github/workflows/packaging-test-pipelines.yml @@ -155,9 +155,7 @@ jobs: run: | echo "Postgres version: ${POSTGRES_VERSION}" - apt-get update -y + sudo apt-get update -y ## Install required packages to execute packaging tools for deb based distros - apt install python3-dev python3-pip -y sudo apt-get purge -y python3-yaml - python3 -m pip install --upgrade pip setuptools==57.5.0 ./.github/packaging/validate_build_output.sh "deb"