Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump version of indy plenum and added pypi versio to 3rd party artifacts #1713

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/build/Dockerfile.ubuntu-2004
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/*
8 changes: 6 additions & 2 deletions build-scripts/ubuntu-2004/build-3rd-parties.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down