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

Addressing #39 #98

Merged
merged 3 commits into from
Mar 10, 2023
Merged

Addressing #39 #98

merged 3 commits into from
Mar 10, 2023

Conversation

bpoldrack
Copy link
Contributor

@bpoldrack bpoldrack commented Jul 12, 2022

Add a marker at the end of the build log for datalad-debian to discover.
We want deb-build-package's internal containers-run call to come
back zero and commit the log, but deb-build-package needs to be able
to discover and report that something went wrong.

In opposition to what's described under 1. in #39 (comment), we now get this (returns non-zero):

❱ datalad deb-build-package hello_2.10-2.dsc                                      
['hello_2.10.orig.tar.gz', 'hello_2.10-2.debian.tar.xz', 'hello_2.10-2.dsc']
[INFO   ] Making sure inputs are available (this may take some time) 
[INFO   ] == Command start (output follows) ===== 
INFO:    Converting SIF file to temporary sandbox...

#
# Extracting the source package: 2022-07-12T12:30:44+00:00
#

dpkg-source: error: invalid line in sha1 checksums string: f7bonc<nöornsufn2a2295e889f66e05ce9bfaed9ace3 725946 hello_2.10.orig.tar.gz
INFO:    Cleaning up image...
[INFO   ] == Command exit (modification check follows) ===== 
run(ok): /tmp/debian-playground/dist/packages/hello (dataset) [singularity run --bind builder/cache/var...]
add(ok): logs/hello_2.10-2_20220712T123044_amd64.txt (file)                                                                                                           
save(ok): . (dataset)                                                                                                                                                 
deb_build_package(error): /tmp/debian-playground/dist/packages/hello (dataset) [Build failed. Check /tmp/debian-playground/dist/packages/hello/logs/hello_2.10-2_20220712T123044_amd64.txt for details.]
action summary:
  add (ok: 1)
  deb_build_package (error: 1)
  get (notneeded: 7)
  run (ok: 1)
  save (notneeded: 1, ok: 1)

Not yet unittested

@codecov-commenter
Copy link

codecov-commenter commented Jul 12, 2022

Codecov Report

Merging #98 (a3373ca) into main (08bc233) will decrease coverage by 0.08%.
The diff coverage is 90.00%.

❗ Current head a3373ca differs from pull request most recent head 724a401. Consider uploading reports for the commit 724a401 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##             main      #98      +/-   ##
==========================================
- Coverage   93.22%   93.14%   -0.08%     
==========================================
  Files          16       16              
  Lines         487      496       +9     
==========================================
+ Hits          454      462       +8     
- Misses         33       34       +1     
Impacted Files Coverage Δ
datalad_debian/build_package.py 89.36% <90.00%> (-0.12%) ⬇️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Add a marker at the end of the build log for datalad-debian to discover.
We want `deb-build-package`'s internal `containers-run` call to come
back zero and commit the log, but `deb-build-package` needs to be able
to discover and report that something went wrong.
@bpoldrack bpoldrack marked this pull request as ready for review July 12, 2022 12:52
Copy link
Contributor

@mih mih left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works for me! Thx.

I left a comment pointing out a relevant helper.

datalad_debian/build_package.py Outdated Show resolved Hide resolved
@adswa
Copy link
Contributor

adswa commented Mar 10, 2023

Given that this PR was approved and I only did a minor review suggestion to use a helper; and the fact that the tests pass, I'll merge this.

@adswa adswa merged commit b7ecde8 into psychoinformatics-de:main Mar 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants