Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Mattia Rizzolo
jenkins.d.n
Commits
8ca7241c
Commit
8ca7241c
authored
Nov 24, 2019
by
Holger Levsen
Browse files
reproducible Archlinux: be a bit more verbose in the job output instead
Signed-off-by:
Holger Levsen
<
holger@layer-acht.org
>
parent
c9066d49
Changes
1
Hide whitespace changes
Inline
Side-by-side
bin/reproducible_build_archlinux_pkg.sh
View file @
8ca7241c
...
...
@@ -438,13 +438,13 @@ if [ ! -z "$(ls $TMPDIR/b1/$SRCPACKAGE/*.pkg.tar.xz 2>/dev/null|| true)" ] ; the
echo
"</p></body>"
)
>
"
$BASE
/archlinux/
$REPOSITORY
/
$SRCPACKAGE
/
$ARTIFACT
.html"
elif
[
-f
$TMPDIR
/b1/
$SRCPACKAGE
/
$ARTIFACT
]
&&
[
-f
$TMPDIR
/b2/
$SRCPACKAGE
/
$ARTIFACT
]
;
then
# run
diffoscope on the results
echo
"
$(
date
-u
)
- running
diffoscope on the results
"
TIMEOUT
=
"60m"
DIFFOSCOPE
=
"
$(
schroot
--directory
/tmp
-c
chroot
:jenkins-reproducible-
${
DBDSUITE
}
-diffoscope
diffoscope
--
--version
2>&1
)
"
echo
"
$(
date
-u
)
- Running
$DIFFOSCOPE
now..."
call_diffoscope
$SRCPACKAGE
$ARTIFACT
elif
[
-f
$TMPDIR
/b1/
$SRCPACKAGE
/
$ARTIFACT
]
||
[
-f
$TMPDIR
/b2/
$SRCPACKAGE
/
$ARTIFACT
]
;
then
#
one of the two builds failed... delete the other one
echo
"
$(
date
-u
)
-
one of the two builds failed... delete the other one
"
(
rm
$TMPDIR
/b1/
$SRCPACKAGE
/
$ARTIFACT
||
rm
$TMPDIR
/b1/
$SRCPACKAGE
/
$ARTIFACT
)
2>/dev/null
else
# some packages define the package version based on the build date
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment