diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index bd857c7..d86cfcf 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -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 diff --git a/.github/workflows/double.yml b/.github/workflows/double.yml index a4c93b3..4ba07ed 100644 --- a/.github/workflows/double.yml +++ b/.github/workflows/double.yml @@ -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 diff --git a/.github/workflows/network-none.yml b/.github/workflows/network-none.yml index 4d58ffe..9472458 100644 --- a/.github/workflows/network-none.yml +++ b/.github/workflows/network-none.yml @@ -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 diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index b070bb5..413d885 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -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 diff --git a/README.md b/README.md index 7fca719..7cf4522 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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: @@ -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. diff --git a/action.yml b/action.yml index 40f0053..743d1cc 100644 --- a/action.yml +++ b/action.yml @@ -5,7 +5,7 @@ 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: @@ -13,7 +13,7 @@ inputs: 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: