Skip to content

Commit 38f6233

Browse files
authored
Merge pull request #21 from ocaisa/software.eessi.io
Update action for `software.eessi.io`
2 parents 58b50fd + 2ba1b7b commit 38f6233

File tree

5 files changed

+24
-50
lines changed

5 files changed

+24
-50
lines changed

.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module purge
22
export FOO=foo
3-
module load GROMACS
3+
module load TensorFlow

.github/workflows/minimal-usage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ubuntu
1+
name: ubuntu-minimal_usage
22
on:
33
push:
44
branches:
@@ -9,7 +9,7 @@ on:
99
# Declare default permissions as read only.
1010
permissions: read-all
1111
jobs:
12-
build:
12+
minimal_usage:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
1-
name: ubuntu_gromacs
1+
name: ubuntu_tensorflow
22
on:
33
push:
44
branches:
55
- main
6-
pull_request:
7-
branches:
8-
- main
96
# Declare default permissions as read only.
107
permissions: read-all
118
jobs:
12-
build:
9+
tensorflow_usage:
1310
runs-on: ubuntu-latest
1411
steps:
1512
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
1613
- uses: eessi/github-action-eessi@main
1714
with:
18-
eessi_stack_version: '2021.06'
15+
eessi_stack_version: '2023.06'
1916
- name: Test EESSI
2017
run: |
21-
# GROMACS module is loaded via .envrc
22-
gmx --version
18+
# TensorFlow module is loaded via .envrc
19+
python -c "import tensorflow; print(tensorflow.__version__)"
2320
shell: bash
24-
- name: Test caching effect EESSI
21+
- name: Test caching effect of EESSI
2522
run: |
26-
gmx --version
23+
python -c "import tensorflow; print(tensorflow.__version__)"
2724
shell: bash
2825
- name: Test module load
2926
run: |

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ module load CMake/3.20.1-GCCcore-10.3.0 # Load a dependency of my project (CMak
1313
Another example of a `.envrc` file can be found in the [.envrc](https://github.com/EESSI/github-action-eessi/blob/main/.envrc) included with this repository.
1414

1515
## Instructions
16-
You can use this GitHub Action in a workflow in your own repository with `uses: eessi/github-action-eessi@v2`.
16+
You can use this GitHub Action in a workflow in your own repository with `uses: eessi/github-action-eessi@v3`.
1717

1818
A minimal job example for GitHub-hosted runners of type `ubuntu-latest`:
1919
```yaml
2020
jobs:
2121
ubuntu-minimal:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: eessi/github-action-eessi@v2
24+
- uses: eessi/github-action-eessi@v3
2525
- name: Test EESSI
2626
run: |
2727
module avail
@@ -44,7 +44,7 @@ jobs:
4444

4545
## Optional Parameters
4646
The following parameters are supported:
47-
- `eessi_stack_version`: version of the EESSI stack to use (defaults to `latest`)
47+
- `eessi_stack_version`: version of the EESSI stack to use (defaults to `2023.06`)
4848
- `eessi_config_package`: location of the EESSI CernVM-FS configuration package (defaults to `https://github.com/EESSI/filesystem-layer/releases/download/latest/cvmfs-config-eessi_latest_all.deb`).
4949
<!--For macOS this parameter is required (e.g., `https://github.com/EESSI/filesystem-layer/releases/download/latest/cvmfs-config-eessi_latest_all.pkg`) -->
5050

@@ -58,7 +58,7 @@ jobs:
5858
build:
5959
runs-on: ubuntu-latest
6060
steps:
61-
- uses: eessi/github-action-eessi@v2
61+
- uses: eessi/github-action-eessi@v3
6262
- name: Test EESSI
6363
run: |
6464
module avail
@@ -70,20 +70,20 @@ jobs:
7070
This GitHub Action installs the [EESSI](https://eessi.github.io/docs/) software stack, making it available to subsequent `bash` commands. This means one can create
7171
workflows such as:
7272
```yaml
73-
name: GROMACS usage
73+
name: TensorFlow usage
7474
on: [push, pull_request]
7575
jobs:
7676
build:
7777
runs-on: ubuntu-latest
7878
steps:
79-
- uses: eessi/github-action-eessi@v2
79+
- uses: eessi/github-action-eessi@v3
8080
- name: Test EESSI
8181
run: |
82-
module load GROMACS
83-
gmx --version
82+
module load TensorFlow
83+
python -c "import tensorflow; print(tensorflow.__version__)"
8484
shell: bash
8585
```
86-
where the `gmx` command was only available to run after the loading the necessary environment module `GROMACS`. Note that I have not given the version of `GROMACS` which means the latest available version will be loaded.
86+
where the `tensorflow` python module was only available to run after the loading the necessary environment module `TensorFlow`. Note that I have not given the version of `TensorFlow` which means the latest available version will be loaded.
8787

8888
## Limitations
8989

action.yml

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,22 @@ inputs:
77
eessi_stack_version:
88
description: 'Version of the EESSI stack to configure'
99
required: false
10-
default: 'latest'
11-
eessi_config_package:
12-
description: 'URL to the EESSI cvmfs config package to install'
13-
required: false
14-
default: 'https://github.com/EESSI/filesystem-layer/releases/download/latest/cvmfs-config-eessi_latest_all.deb'
15-
cvmfs_client_profile:
16-
description: 'Choose a suitable proxy automatically if set to single.'
17-
required: false
18-
default: 'single'
19-
cvmfs_quota_limit:
20-
description: 'Soft-limit of the cache in Megabyte. Consult https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners#supported-runners-and-hardware-resources before changing'
21-
required: false
22-
default: '15000'
23-
cvmfs_use_cdn:
24-
description: 'Change the stratum 1 endpoints to caching servers from Cloudflare.'
25-
required: false
26-
default: 'yes'
27-
10+
default: '2023.06'
2811

2912
runs:
3013
using: "composite"
3114
steps:
3215
- uses: cvmfs-contrib/github-action-cvmfs@d4641d0d591c9a5c3be23835ced2fb648b44c04b # v3.1
3316
with:
34-
cvmfs_config_package: ${{ inputs.eessi_config_package }}
17+
cvmfs_config_package: https://github.com/EESSI/filesystem-layer/releases/download/latest/cvmfs-config-eessi_latest_all.deb
3518
cvmfs_http_proxy: DIRECT
36-
cvmfs_client_profile: ${{ inputs.cvmfs_client_profile }}
37-
cvmfs_quota_limit: ${{ inputs.cvmfs_quota_limit }}
38-
cvmfs_use_cdn: ${{ inputs.cvmfs_use_cdn }}
19+
cvmfs_repositories: software.eessi.io
3920
- id: install-eessi
4021
run: |
4122
echo "EESSI_SILENT=1" >> $GITHUB_ENV
42-
if [ "${{ inputs.eessi_stack_version }}" == "latest" ]; then
43-
echo "source /cvmfs/pilot.eessi-hpc.org/$EESSI_STACK_VERSION/init/bash" >> $HOME/env_config.export
44-
else
45-
echo "source /cvmfs/pilot.eessi-hpc.org/versions/$EESSI_STACK_VERSION/init/bash" >> $HOME/env_config.export
46-
fi
47-
sudo apt install -y direnv
4823
echo 'unset BASH_ENV' >> $HOME/env_config.export
24+
echo "source /cvmfs/software.eessi.io/versions/$EESSI_STACK_VERSION/init/bash" >> $HOME/env_config.export
25+
sudo apt install -y direnv
4926
echo 'eval "$(direnv export bash)"' >> $HOME/env_config.export
5027
mkdir -p $HOME/direnv/
5128
echo "[whitelist]" >> $HOME/direnv/direnv.toml

0 commit comments

Comments
 (0)