From 806b82cf76248959991c058e02dbeb27217f2a99 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Tue, 9 Dec 2025 12:56:41 +0100 Subject: [PATCH 1/4] fix-debug-steps in adding_software --- docs/adding_software/debugging_failed_builds.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/adding_software/debugging_failed_builds.md b/docs/adding_software/debugging_failed_builds.md index efac1f9d58..7df5188c65 100644 --- a/docs/adding_software/debugging_failed_builds.md +++ b/docs/adding_software/debugging_failed_builds.md @@ -147,6 +147,11 @@ Note that you could also combine approaches: first build everything using the `E To build software using the `EESSI-install-software.sh` script, you'll first need to get the diff file for the PR. This is used by the `EESSI-install-software.sh` script to see what is changed in this PR - and thus what needs to be build for this PR. To download the diff for PR 360, we would e.g. do ``` wget https://github.com/EESSI/software-layer/pull/360.diff +git clone https://github.com/EESSI/software-layer.git +cd software-layer +git pull origin pull/360/head +cd .. +cp -r software-layer/easystacks . ``` Now, we run the `EESSI-install-software.sh` script: From ec6bbc40a2b1e87fcbeda21088e8edea7410fa77 Mon Sep 17 00:00:00 2001 From: TopRichard <121792457+TopRichard@users.noreply.github.com> Date: Wed, 10 Dec 2025 15:59:47 +0100 Subject: [PATCH 2/4] Update docs/adding_software/debugging_failed_builds.md Co-authored-by: Kenneth Hoste --- docs/adding_software/debugging_failed_builds.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/adding_software/debugging_failed_builds.md b/docs/adding_software/debugging_failed_builds.md index 7df5188c65..982a61336c 100644 --- a/docs/adding_software/debugging_failed_builds.md +++ b/docs/adding_software/debugging_failed_builds.md @@ -146,10 +146,11 @@ Note that you could also combine approaches: first build everything using the `E To build software using the `EESSI-install-software.sh` script, you'll first need to get the diff file for the PR. This is used by the `EESSI-install-software.sh` script to see what is changed in this PR - and thus what needs to be build for this PR. To download the diff for PR 360, we would e.g. do ``` -wget https://github.com/EESSI/software-layer/pull/360.diff +PR=123456789 # change this to correct the PR number +wget https://github.com/EESSI/software-layer/pull/${PR}.diff git clone https://github.com/EESSI/software-layer.git cd software-layer -git pull origin pull/360/head +git pull origin pull/${PR}/head cd .. cp -r software-layer/easystacks . ``` From 858f45b1ff1d879103c44045e4529381ebcd5997 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Wed, 10 Dec 2025 16:38:28 +0100 Subject: [PATCH 3/4] updated the text to fit PR as a variable --- docs/adding_software/debugging_failed_builds.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/adding_software/debugging_failed_builds.md b/docs/adding_software/debugging_failed_builds.md index 982a61336c..9ef7263e8b 100644 --- a/docs/adding_software/debugging_failed_builds.md +++ b/docs/adding_software/debugging_failed_builds.md @@ -144,7 +144,9 @@ The Automatic build and deploy [bot](../bot.md) installs software by executing t Note that you could also combine approaches: first build everything using the `EESSI-install-software.sh` script, until you reproduce the failure. Then, start making modifications (e.g. changes to the EasyConfig, patches, etc) and trying to rebuild that package individually to test your changes. -To build software using the `EESSI-install-software.sh` script, you'll first need to get the diff file for the PR. This is used by the `EESSI-install-software.sh` script to see what is changed in this PR - and thus what needs to be build for this PR. To download the diff for PR 360, we would e.g. do +To build software using the EESSI-install-software.sh script, you first need to download the diff file for the relevant pull request. The script uses this diff to determine which changes are included in the PR and therefore which software needs to be built. + +We now define the PR number through a ${PR} variable and use it throughout the commands. For example: ``` PR=123456789 # change this to correct the PR number wget https://github.com/EESSI/software-layer/pull/${PR}.diff From 548e011888973d093c7177dcdc4a3e5f224255cc Mon Sep 17 00:00:00 2001 From: Richard Top Date: Wed, 10 Dec 2025 16:41:57 +0100 Subject: [PATCH 4/4] Fix typo --- docs/adding_software/debugging_failed_builds.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adding_software/debugging_failed_builds.md b/docs/adding_software/debugging_failed_builds.md index 9ef7263e8b..dd9f72445a 100644 --- a/docs/adding_software/debugging_failed_builds.md +++ b/docs/adding_software/debugging_failed_builds.md @@ -144,7 +144,7 @@ The Automatic build and deploy [bot](../bot.md) installs software by executing t Note that you could also combine approaches: first build everything using the `EESSI-install-software.sh` script, until you reproduce the failure. Then, start making modifications (e.g. changes to the EasyConfig, patches, etc) and trying to rebuild that package individually to test your changes. -To build software using the EESSI-install-software.sh script, you first need to download the diff file for the relevant pull request. The script uses this diff to determine which changes are included in the PR and therefore which software needs to be built. +To build software using the `EESSI-install-software.sh` script, you first need to download the diff file for the relevant pull request. The script uses this diff to determine which changes are included in the PR and therefore which software needs to be built. We now define the PR number through a ${PR} variable and use it throughout the commands. For example: ```