Skip to content

Commit 7ff0e72

Browse files
committed
Disable build-env-configure; add info-mpileaks.out TODO
Signed-off-by: tldahlgren <dahlgren1@llnl.gov>
1 parent fe24df8 commit 7ff0e72

2 files changed

Lines changed: 16 additions & 9 deletions

File tree

outputs/packaging.sh

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ example packaging/checksum-mpileaks-1 "spack checksum tutorial-mpileaks 1.0"
2929

3030
example --expect-error packaging/install-mpileaks-1 "spack install tutorial-mpileaks"
3131

32-
# TODO: Update this output manually since automation fails.
32+
# TODO: Update info-mpileaks.out output manually since automation fails.
33+
#
3334
# This fails ("Error: invalid width -2 (must be > 0)") in CI when preparing
3435
# variants BUT not when run on the command line.
3536
#cp "$PROJECT/package-py-files/1.package.py" "$mpileaks_package_py"
@@ -41,12 +42,16 @@ example --expect-error packaging/install-mpileaks-2 "spack install tutorial-mpi
4142
stage_dir="$(spack location -s tutorial-mpileaks)"
4243
example packaging/build-output "cat $stage_dir/spack-build-out.txt"
4344

44-
prefix=$(spack python -c \
45-
'import spack.concretize; print(spack.concretize.concretize_one("tutorial-mpileaks").prefix)')
46-
spack cd tutorial-mpileaks
47-
echo "configure --prefix=$prefix" | example packaging/build-env-configure "spack build-env tutorial-mpileaks -- bash"
48-
# Unfortunately cannot use a function since it appears to cause excessive delays
49-
# in output regeneration.
45+
# TODO: Update build-env-configure output manually since automation fails.
46+
#
47+
# 1. Original approach fails since configure cannot be found.
48+
#prefix=$(spack python -c \
49+
# 'import spack.concretize; print(spack.concretize.concretize_one("tutorial-mpileaks").prefix)')
50+
#spack cd tutorial-mpileaks
51+
#echo "configure --prefix=$prefix" | example packaging/build-env-configure "spack build-env tutorial-mpileaks -- bash"
52+
#
53+
# 2. Using a bash function .. seems to encounter excessive delays on the order
54+
# of over 10 minutes when watched in CI
5055
#run_configure() (
5156
# prefix=$(spack python -c \
5257
# 'import spack.concretize; print(spack.concretize.concretize_one("tutorial-mpileaks").prefix)')

tutorial_packaging.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ The areas we need to modify are highlighted in the figure below.
122122

123123
.. tip::
124124

125-
We generally recommend you use the project-prepared archive url, when available, instead of the ``GitHub``-generated ``Source code (tar.gz)`` url since those tend to be less volatile in the face of ``GitHub`` shasum algorithm changes.
125+
We generally recommend you use the project-prepared archive url, when available, instead of the ``GitHub``-generated ``Source code (tar.gz)`` since those tend to be less volatile in the face of ``GitHub`` shasum algorithm changes.
126126

127127
In this case, that would mean using the ``https://github.com/LLNL/mpileaks/releases/download/v1.0/mpileaks-1.0.tar.gz`` url.
128128
Since the file has special build customizations, the ``sha256`` is different.
129129
Key among the changes is the presence of ``autogen.sh``, which is a convenience script projects use to customize their Autotools reconfiguration process.
130130
Consequently, you would replace the more general call to ``autoreconf()`` here with an invocation of the ``autogen.sh`` script.
131131
An example of setting up and using such a script can be found in the `sos <https://github.com/spack/spack-packages/blob/develop/repos/spack_repo/builtin/packages/sos/package.py>`_ package.
132132

133-
Since we are providing a ``url``, we can `confirm the checksum <https://spack.readthedocs.io/en/latest/packaging_guide_creation.html#checksum-verification>`_, or ``sha256`` calculation.
133+
Since we are providing a ``url``, we can `confirm the checksum <https://spack.readthedocs.io/en/latest/packaging_guide_creation.html#checksum-verification>`_, or ``sha256``, calculation.
134134
Exit your editor to return to the command line and use the `spack checksum <https://spack.readthedocs.io/en/latest/packaging_guide_creation.html#spack-checksum>`_ command:
135135

136136
.. literalinclude:: outputs/packaging/checksum-mpileaks-1.out
@@ -196,6 +196,8 @@ It won't help us build the software; however, the information is now available f
196196

197197
.. _info_mpileaks:
198198

199+
.. TODO: The output to info-mpileaks.out must be manually generated.
200+
199201
Let's enter the `spack info <https://spack.readthedocs.io/en/latest/package_fundamentals.html#cmd-spack-info>`_ command for the package:
200202

201203
.. literalinclude:: outputs/packaging/info-mpileaks.out

0 commit comments

Comments
 (0)