Skip to content

Commit

Permalink
fix: jug_xl -> eic_xl; cvmfs-contrib/github-action-cvmfs@v4 (#17)
Browse files Browse the repository at this point in the history
### Briefly, what does this PR introduce?
This PR updates instances of jug_xl to eic_xl.
  • Loading branch information
wdconinc authored Dec 1, 2024
1 parent f5b7795 commit 65c8071
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: cvmfs-contrib/github-action-cvmfs@v3
- uses: cvmfs-contrib/github-action-cvmfs@v4
with:
cvmfs_repositories: 'singularity.opensciencegrid.org'
- uses: ./
with:
platform-release: "jug_xl:nightly"
platform-release: "eic_xl:nightly"
run: |
gcc --version
which gcc
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/double.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: cvmfs-contrib/github-action-cvmfs@v3
- uses: cvmfs-contrib/github-action-cvmfs@v4
with:
cvmfs_repositories: 'singularity.opensciencegrid.org'
- uses: ./
with:
platform-release: "jug_xl:nightly"
platform-release: "eic_xl:nightly"
run: |
gcc --version
which gcc
eic-info
- uses: ./
with:
platform-release: "jug_xl:nightly"
platform-release: "eic_xl:nightly"
run: |
gcc --version
which gcc
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/network-none.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: cvmfs-contrib/github-action-cvmfs@v3
- uses: cvmfs-contrib/github-action-cvmfs@v4
with:
cvmfs_repositories: 'singularity.opensciencegrid.org'
- uses: ./
with:
platform-release: "jug_xl:nightly"
platform-release: "eic_xl:nightly"
network_types: "none"
run: |
if ping -c 1 8.8.8.8 ; then
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: cvmfs-contrib/github-action-cvmfs@v3
- uses: cvmfs-contrib/github-action-cvmfs@v4
with:
cvmfs_repositories: 'singularity.opensciencegrid.org'
- uses: ./
with:
platform-release: "jug_xl:nightly"
platform-release: "eic_xl:nightly"
apptainer_version: "v1.1.2"
run: |
gcc --version
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This GitHub Action executes user payload code inside a EIC shell environment, sp
## Instructions

### Prerequisites
This action depends on the user to call the companion action `uses: cvmfs-contrib/github-action-cvmfs@v2` before using `uses: eic/run-cvmfs-osg-eic-shell@v1`, which will install CVMFS on the node. GitHub Actions currently do not support calling the action `github-action-cvmfs` from within `run-cvmfs-osg-eic-shell`, this needs to be done explicitly by the user.
This action depends on the user to call the companion action `uses: cvmfs-contrib/github-action-cvmfs@v4` before using `uses: eic/run-cvmfs-osg-eic-shell@v1`, which will install CVMFS on the node. GitHub Actions currently do not support calling the action `github-action-cvmfs` from within `run-cvmfs-osg-eic-shell`, this needs to be done explicitly by the user.

### Example

Expand All @@ -18,17 +18,17 @@ jobs:
run-eic-shell:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: cvmfs-contrib/github-action-cvmfs@v2
- uses: actions/checkout@v4
- uses: cvmfs-contrib/github-action-cvmfs@v4
- uses: eic/run-cvmfs-osg-eic-shell@v1
with:
platform-release: "jug_xl:nightly"
platform-release: "eic_xl:nightly"
run: |
gcc --version
which gcc
eic-info
```
In this case the action will automatically resolve the correct container image (in this case `jug_xl:nightly`) and spawn an instance with Singularity from `/cvmfs/singularity.opensciencegrid.org/`.
In this case the action will automatically resolve the correct container image (in this case `eic_xl:nightly`) and spawn an instance with Singularity from `/cvmfs/singularity.opensciencegrid.org/`.

The action mounts the checkout directory into the mentioned container and wraps the variable `run` in the script:

Expand All @@ -50,9 +50,9 @@ which is executed in the container and thus giving the user an easy and direct a

### Parameters
The following parameters are supported:
- `platform`: EIC shell platform you are targeting (e.g. `jug_xl`)
- `platform`: EIC shell platform you are targeting (e.g. `eic_xl`)
- `release`: EIC shell release you are targeting (e.g. `3.0-stable`)
- `platform-release`: EIC shell platform release string you are targeting (e.g. `jug_xl:3.0-stable`)
- `platform-release`: EIC shell platform release string you are targeting (e.g. `eic_xl:3.0-stable`)
- `run`: They payload code you want to execute on top of the view
- `setup`: Initialization/Setup script for a view that sets the environment (e.g. `/opt/detector/epic-main/bin/thisepic.sh`)
- `sandbox-path`: Path where the setup script for the custom view is location. By specifying this variable the auto-resolving of the view based on `release` and `platform` is disabled.
Expand Down
4 changes: 2 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ branding:
color: 'blue'
inputs:
platform:
description: 'EIC shell platform you are targeting (e.g. jug_xl)'
description: 'EIC shell platform you are targeting (e.g. eic_xl)'
required: false
default: ''
release:
description: 'EIC shell release you are targeting (e.g. 3.0-stable)'
required: false
default: ''
platform-release:
description: 'EIC shell release platform string you are targeting (e.g. jug_xl:3.0-stable)'
description: 'EIC shell release platform string you are targeting (e.g. eic_xl:24.11.2-stable)'
required: false
default: ''
run:
Expand Down

0 comments on commit 65c8071

Please sign in to comment.