From 22f87dcf8ad59975fbba636fe5cc95dbeb6d1726 Mon Sep 17 00:00:00 2001 From: udosson Date: Thu, 11 Nov 2021 11:06:38 +0100 Subject: [PATCH] bump version of indy plenum and added pypi versio to 3rd party artifacts Signed-off-by: udosson --- .github/workflows/build/Dockerfile.ubuntu-2004 | 7 +++++-- build-scripts/ubuntu-2004/build-3rd-parties.sh | 8 ++++++-- setup.py | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build/Dockerfile.ubuntu-2004 b/.github/workflows/build/Dockerfile.ubuntu-2004 index a7d5eb387..ec7afc5f6 100644 --- a/.github/workflows/build/Dockerfile.ubuntu-2004 +++ b/.github/workflows/build/Dockerfile.ubuntu-2004 @@ -10,7 +10,9 @@ RUN apt-get update -y && apt-get install -y \ gnupg \ apt-transport-https \ ca-certificates \ - apt-utils + apt-utils \ + curl \ + jq # ======================================================================================================== # Update repository signing keys @@ -69,7 +71,8 @@ RUN pip3 install -U \ # install fpm -RUN gem install --no-document rake fpm +RUN gem install --no-document rake +RUN gem install --no-document fpm -v 1.13.1 RUN apt-get -y autoremove \ && rm -rf /var/lib/apt/lists/* diff --git a/build-scripts/ubuntu-2004/build-3rd-parties.sh b/build-scripts/ubuntu-2004/build-3rd-parties.sh index 4b7311b73..363cfa063 100755 --- a/build-scripts/ubuntu-2004/build-3rd-parties.sh +++ b/build-scripts/ubuntu-2004/build-3rd-parties.sh @@ -10,6 +10,10 @@ function build_from_pypi { if [ -z "$2" ]; then PACKAGE_VERSION="" + # Get the most recent package version from PyPI to be included in the package name of the Debian artifact + curl -X GET "https://pypi.org/pypi/${PACKAGE_NAME}/json" > "${PACKAGE_NAME}.json" + PACKAGE_VERSION="==$(cat "${PACKAGE_NAME}.json" | jq --raw-output '.info.version')" + rm "${PACKAGE_NAME}.json" else PACKAGE_VERSION="==$2" fi @@ -45,7 +49,7 @@ function build_from_pypi { SCRIPT_PATH="${BASH_SOURCE[0]}" pushd `dirname ${SCRIPT_PATH}` >/dev/null -build_from_pypi timeout-decorator 0.4.0 -build_from_pypi distro 1.3.0 +build_from_pypi timeout-decorator +build_from_pypi distro popd >/dev/null \ No newline at end of file diff --git a/setup.py b/setup.py index 6fec65897..cd88b4086 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ data_files=[( (BASE_DIR, ['data/nssm_original.exe']) )], - install_requires=['indy-plenum==1.13.0.dev135', + install_requires=['indy-plenum==1.13.0.dev175', 'timeout-decorator>=0.5.0', 'distro>=1.5.0'], setup_requires=['pytest-runner'],