From 7bc0a89e8a90a8dac792c97e078b92200df816e7 Mon Sep 17 00:00:00 2001 From: Leonid Fedorov Date: Mon, 12 Aug 2024 16:02:59 +0400 Subject: [PATCH] more cpack troubles --- .drone.jsonnet | 2 +- tests/scripts/fdb_build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index ba8a4bb1b..d2ca69b16 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -94,7 +94,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise') 'mkdir -p /drone/src/' + result, 'ls -al fdb_build/packages', 'cp fdb_build/packages/*.' + pkg_format + ' /drone/src/' + result, - if(pkg_format == 'rpm') then 'createrepo ./' + result else 'dpkg-scanpackages %s | gzip > ./%s/Packages.gz' % [result, result], + if(pkg_format == 'rpm') then 'createrepo /drone/src/' + result else 'dpkg-scanpackages /drone/src/%s | gzip > /drone/src/%s/Packages.gz' % [result, result], ], }, ] + diff --git a/tests/scripts/fdb_build.sh b/tests/scripts/fdb_build.sh index 49a282938..352c30956 100644 --- a/tests/scripts/fdb_build.sh +++ b/tests/scripts/fdb_build.sh @@ -64,7 +64,7 @@ if [[ ${ID} == 'ubuntu' || ${ID} == 'debian' ]]; then PACKAGES_SUFFIX="-DDEB=${VERSION_CODENAME}" print_env ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime - DEBIAN_FRONTEND=noninteractive apt install -y -qq automake cmake curl g++ gcc git jq libjemalloc-dev libssl-dev mono-devel patch python3-dev unzip + DEBIAN_FRONTEND=noninteractive apt install -y -qq automake cmake curl file g++ gcc git jq libjemalloc-dev libssl-dev mono-devel patch python3-dev unzip elif [[ ${ID} == "rocky" ]]; then PKG_MANAGER='yum install -y'