Skip to content

Commit

Permalink
ci: python3-minimal is insufficient
Browse files Browse the repository at this point in the history
Change-Id: I90359d05a7c997de7ef5b3aa4e4c445e095e632c
  • Loading branch information
Pesa committed Apr 23, 2024
1 parent cc02c36 commit 164414b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .jenkins.d/00-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
set -eo pipefail

APT_PKGS=(
build-essential
dpkg-dev
g++
libboost-chrono-dev
libboost-date-time-dev
libboost-dev
Expand All @@ -16,7 +17,7 @@ APT_PKGS=(
libsqlite3-dev
libssl-dev
pkg-config
python3-minimal
python3
)
FORMULAE=(boost openssl pkg-config)
PIP_PKGS=()
Expand Down
8 changes: 5 additions & 3 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,12 @@ def version(ctx):
cmd = ['git', 'describe', '--abbrev=8', '--always', '--match', f'{GIT_TAG_PREFIX}*']
version_from_git = subprocess.run(cmd, capture_output=True, check=True, text=True).stdout.strip()
if version_from_git:
if version_from_git.startswith(GIT_TAG_PREFIX):
Context.g_module.VERSION = version_from_git.lstrip(GIT_TAG_PREFIX)
if GIT_TAG_PREFIX and version_from_git.startswith(GIT_TAG_PREFIX):
Context.g_module.VERSION = version_from_git[len(GIT_TAG_PREFIX):]
elif not GIT_TAG_PREFIX and ('.' in version_from_git or '-' in version_from_git):
Context.g_module.VERSION = version_from_git
else:
# no tags matched
# no tags matched (or we are in a shallow clone)
Context.g_module.VERSION = f'{VERSION_BASE}+git.{version_from_git}'
except (OSError, subprocess.SubprocessError):
pass
Expand Down

0 comments on commit 164414b

Please sign in to comment.