Skip to content

Commit 35edf09

Browse files
authored
Update action.yml
1 parent 75e4e03 commit 35edf09

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

action.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ inputs:
1313
required: false
1414
default: 'software.eessi.io,dev.eessi.io'
1515
use_eessi_module:
16-
description: 'Use the EESSI module to initialise EESSI (rather than sourcing a bash script), any non-empty value is true'
16+
description: 'Use the EESSI module to initialise EESSI (rather than sourcing a bash script), valid values are true or false'
1717
required: false
18-
default: ''
18+
default: 'false'
19+
init_direnv:
20+
description: 'Enable direnv initialisation for the repository, valid values are true or false'
21+
required: false
22+
default: 'true'
1923

2024
runs:
2125
using: "composite"
@@ -30,21 +34,23 @@ runs:
3034
run: |
3135
if [ "$RUNNER_OS" == "Linux" ]; then
3236
echo 'unset BASH_ENV' >> $HOME/env_config.export
33-
if [[ -n "${{ inputs.use_eessi_module }}" ]]; then
37+
if [[ "${{ inputs.use_eessi_module }}" == "true" ]]; then
3438
echo "source /cvmfs/software.eessi.io/versions/$EESSI_STACK_VERSION/init/lmod/bash" >> $HOME/env_config.export
3539
else
3640
echo "source /cvmfs/software.eessi.io/versions/$EESSI_STACK_VERSION/init/bash" >> $HOME/env_config.export
3741
fi
3842
# allow oversubscription for OpenMPI
3943
echo "export OMPI_MCA_rmaps_base_oversubscribe=1" >> $HOME/env_config.export
40-
sudo apt install -y direnv
41-
echo 'eval "$(direnv export bash)"' >> $HOME/env_config.export
42-
mkdir -p $HOME/direnv/
43-
echo "[whitelist]" >> $HOME/direnv/direnv.toml
44-
echo "prefix = [ '$GITHUB_WORKSPACE' ]" >> $HOME/direnv/direnv.toml
45-
cp $HOME/direnv/direnv.toml $HOME/direnv/config.toml
44+
if [[ "${{ inputs.init_direnv }}" == "true" ]]; then
45+
sudo apt install -y direnv
46+
echo 'eval "$(direnv export bash)"' >> $HOME/env_config.export
47+
mkdir -p $HOME/direnv/
48+
echo "[whitelist]" >> $HOME/direnv/direnv.toml
49+
echo "prefix = [ '$GITHUB_WORKSPACE' ]" >> $HOME/direnv/direnv.toml
50+
cp $HOME/direnv/direnv.toml $HOME/direnv/config.toml
51+
echo "DIRENV_CONFIG=$HOME/direnv" >> $GITHUB_ENV
52+
fi
4653
echo "BASH_ENV=$HOME/env_config.export" >> $GITHUB_ENV
47-
echo "DIRENV_CONFIG=$HOME/direnv" >> $GITHUB_ENV
4854
elif [ "$RUNNER_OS" == "macOS" ]; then
4955
# EESSI on macOS requires lima so we get a Linux VM, see https://gitlab.com/eessi/support/-/issues/70
5056
# (unfortunately this requires nested virtualisation in GitHub Actions which is not available with M1)

0 commit comments

Comments
 (0)