Fix rebuild check in bot/build.sh script, and always resume from the correct temporary directory
#518
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Instance
|
boegel
requested changes
Mar 27, 2024
Co-authored-by: Kenneth Hoste <kenneth.hoste@ugent.be>
boegel
reviewed
Mar 27, 2024
|
PR has been extensively tested in #519 The only scenario that is currently not supported is when a single PR both rebuilds and adds some package. This can be fixed by the following (tested in #519 (comment)) diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
index 470663e..63b68a5 100755
--- a/EESSI-install-software.sh
+++ b/EESSI-install-software.sh
@@ -204,11 +204,14 @@ ${EESSI_PREFIX}/scripts/gpu_support/nvidia/install_cuda_host_injections.sh -c 12
# use PR patch file to determine in which easystack files stuff was added
changed_easystacks=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^easystacks/.*yml$' | egrep -v 'known-issues|missing')
-if [ -z ${changed_easystacks} ]; then
+if [ -z "${changed_easystacks}" ]; then
echo "No missing installations, party time!" # Ensure the bot report success, as there was nothing to be build here
else
- for easystack_file in ${changed_easystacks}; do
+ # first process rebuilds if any, then easystack files for new installations
+ rebuild_easystacks=$(echo "${changed_easystacks}" | grep /rebuilds/ || true)
+ new_easystacks=$(echo "${changed_easystacks}" | grep -v /rebuilds/ || true)
+ for easystack_file in ${rebuild_easystacks} ${new_easystacks}; do
echo -e "Processing easystack file ${easystack_file}...\n\n"or a similar change in #507 |
boegel
approved these changes
Mar 27, 2024
This was referenced Apr 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Due to the
set -e, the grep command that checks for rebuild easystacks would cause the entire script to fail if there is nothing to be rebuilt. Fixed that by adding a true command to the end.Also included some other fixes, e.g. one to make sure that the tarball step resumes from the right temp dir (either from the rebuild step or build step, depending on whether a rebuild was done or not).