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

test archive #35

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
5 changes: 5 additions & 0 deletions .github/workflows/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,8 @@ jobs:
run: |
. external/spack/share/spack/setup-env.sh
spack install thapi@master ^lttng-tools@master ^lttng-ust@master ^babeltrace2@master

- name: Install thapi master archive
run: |
. external/spack/share/spack/setup-env.sh
spack install thapi@master+archive
5 changes: 5 additions & 0 deletions packages/babeltrace2/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class Babeltrace2(AutotoolsPackage):
maintainers = ['Kerilk']

version('master', branch='master')
version('archive', branch='src-ctf-lttng-archive')

version('2.0.6', sha256='a01c7e75e642de0b5b91f32cc706234c99eb556fcd52c9959045dc23a9ec52c9')
version('2.0.5', sha256='7b8f9ef2a7ee7c9ec292d4568811cf6926089b25e49cdaab449e2cb724edf2b4')
version('2.0.4', sha256='774f116685dab5db9c51577dde43c8c1df482aae6bb78a089b1e9e7c8b489bca')
Expand All @@ -42,6 +44,9 @@ class Babeltrace2(AutotoolsPackage):
depends_on('[email protected]:', type=('build', 'link'))
depends_on('[email protected]:')

with when('@archive'):
depends_on('lttng-tools', type=('build', 'link', 'run'))

with when("+python-bindings"):
depends_on('[email protected]:')
depends_on('[email protected]:')
Expand Down
4 changes: 4 additions & 0 deletions packages/thapi/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ class Thapi(AutotoolsPackage):
# We don't add Python as a runtime dependency of lttng to avoid python propagated as a runtime dependency of thapi
depends_on('python', type=('build'))

variant('archive', default=False, description='Support for live analysis of archive')
with when("+archive"):
depends_on('babeltrace2@archive', type=('build', 'run'))

variant('strict', default=False, description='Enable -Werror during the build')
def configure_args(self):
args = []
Expand Down
Loading