Merge branch 'main' into init_scripts_fix_version

Author: boegel

.github/workflows/tests_readme.yml

@@ -359,7 +359,7 @@ else
     for easystack_file in ${rebuild_easystacks} ${new_easystacks}; do
 
         # make sure that easystack file being picked up is for EESSI version that we're building for...
-        echo "${easystack_file}" | grep -q "^easystacks/${EESSI_VERSION}/"
+        echo "${easystack_file}" | grep -q "^easystacks/$(basename ${EESSI_CVMFS_REPO})/${EESSI_VERSION}/"
         if [ $? -ne 0 ]; then
             fatal_error "Easystack file ${easystack_file} is not intended for EESSI version ${EESSI_VERSION}, giving up!"
         fi

EESSI-install-software.sh

@@ -1,45 +1,17 @@
-# Software layer
+# Software layer scripts
 
-The software layer of the EESSI project uses [EasyBuild](https://docs.easybuild.io), [Lmod](https://lmod.readthedocs.io) and [archspec](https://archspec.readthedocs.io).
+Scripts for building the EESSI software layer.
 
 See also https://www.eessi.io/docs/software_layer .
 
-## Pilot software stack
-
-You can set up your environment by sourcing the init script:
-
-```
-$ source /cvmfs/software.eessi.io/versions/2023.06/init/bash
-Found EESSI repo @ /cvmfs/software.eessi.io/versions/2023.06!
-Derived subdirectory for software layer: x86_64/intel/haswell
-Using x86_64/intel/haswell subdirectory for software layer
-Initializing Lmod...
-Prepending /cvmfs/software.eessi.io/versions/2023.06/software/x86_64/intel/haswell/modules/all to $MODULEPATH...
-Environment set up to use EESSI (2023.06), have fun!
-[EESSI 2023.06] $
-```
-
-### Accessing EESSI via a container
-
-You need Singularity version 3.7 or newer. Then, simply run
-
-```
-$ ./eessi_container.sh
-```
-Once you get presented the prompt `Singularity>` run the above `source` command.
-
-If you want to build a package for the software repository, simply add the arguments `--access rw`, e.g., full command would be
-
-```
-$ ./eessi_container.sh --access rw
-```
-Note, not all features/arguments listed via `./eessi_container.sh --help` are implemented.
+Easystack files used for specifying which software installations are included in EESSI software layer are in
+[EESSI/software-layer](https://github.com/EESSI/software-layer) repository.
 
 # License
 
 The software in this repository is distributed under the terms of the
 [GNU General Public License v2.0](https://opensource.org/licenses/GPL-2.0).
 
-See [LICENSE](https://github.com/EESSI/software-layer/blob/main/LICENSE) for more information.
+See [LICENSE](https://github.com/EESSI/software-layer-scripts/blob/main/LICENSE) for more information.
 
 SPDX-License-Identifier: GPL-2.0-only

README.md

@@ -49,8 +49,12 @@ compare_and_copy() {
     if [ ! -f "$destination_file" ] || ! diff -q "$source_file" "$destination_file" ; then
         echo "Files $source_file and $destination_file differ, checking if we should copy or not"
         # We only copy if the file is part of the PR
-        if file_changed_in_pr "$source_file"; then
-          echo "File has changed in the PR"
+        if [ ! -f "${destination_file}" ] || file_changed_in_pr "$source_file"; then
+          if [ ! -f "${destination_file}" ]; then
+            echo "File has not been copied yet ($destination_file does not exist}"
+          else
+            echo "File has changed in the PR"
+          fi
           cp "$source_file" "$destination_file"
           echo "File $source_file copied to $destination_file"
         else