diff --git a/.github/workflows/cvmfs_config_package.yml b/.github/workflows/cvmfs_config_package.yml index 32f073f..a67be97 100644 --- a/.github/workflows/cvmfs_config_package.yml +++ b/.github/workflows/cvmfs_config_package.yml @@ -5,12 +5,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: cvmfs-contrib/github-action-cvmfs@main + - uses: ./ with: cvmfs_repositories: 'pilot.eessi-hpc.org' cvmfs_http_proxy: 'DIRECT' cvmfs_config_package: 'https://github.com/EESSI/filesystem-layer/releases/download/v0.4.0/cvmfs-config-eessi_0.4.0_all.deb' - run_local_checkout: 'true' - name: Test CernVM-FS run: | echo "### Dump default.local ###" diff --git a/.github/workflows/cvmfs_http_proxy.yml b/.github/workflows/cvmfs_http_proxy.yml index 459e510..65495cc 100644 --- a/.github/workflows/cvmfs_http_proxy.yml +++ b/.github/workflows/cvmfs_http_proxy.yml @@ -5,10 +5,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: cvmfs-contrib/github-action-cvmfs@main + - uses: ./ with: cvmfs_http_proxy: 'auto' - run_local_checkout: 'true' - name: Setup CernVM-FS run: | echo "### Dump default.local ###" diff --git a/.github/workflows/cvmfs_repositories.yml b/.github/workflows/cvmfs_repositories.yml index f215b75..246c7da 100644 --- a/.github/workflows/cvmfs_repositories.yml +++ b/.github/workflows/cvmfs_repositories.yml @@ -5,10 +5,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: cvmfs-contrib/github-action-cvmfs@main + - uses: ./ with: cvmfs_repositories: 'grid.cern.ch' - run_local_checkout: 'true' - name: Test CernVM-FS run: | echo "### Dump default.local ###" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b03bd27..1ed1c7b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,10 +13,9 @@ jobs: os: [macos-latest, macos-10.15, macos-11] steps: - uses: actions/checkout@v2 - - uses: cvmfs-contrib/github-action-cvmfs@main + - uses: ./ with: cvmfs_repositories: 'sft.cern.ch' - run_local_checkout: 'true' - name: Test CernVM-FS run: | echo "### Dump default.local ###" diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7486dba..620c0be 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -13,9 +13,7 @@ jobs: os: [ubuntu-latest, ubuntu-18.04, ubuntu-20.04] steps: - uses: actions/checkout@v2 - - uses: cvmfs-contrib/github-action-cvmfs@main - with: - run_local_checkout: 'true' + - uses: ./ - name: Test CernVM-FS run: | echo "### Dump default.local ###" diff --git a/action.yml b/action.yml index 35b356f..3120fa8 100644 --- a/action.yml +++ b/action.yml @@ -332,15 +332,10 @@ runs: using: "composite" steps: - run: | - if [ "${{ inputs.run_local_checkout }}" == "true" ]; then - echo "WARNING running local checkout of the action !" - . setup-cvmfs.sh local - else - ${{ github.action_path }}/setup-cvmfs.sh - fi + ${{ github.action_path }}/setup-cvmfs.sh shell: bash env: - THIS: ${{ github.action_path }} + ACTION_PATH: ${{ github.action_path }} CVMFS_ALIEN_CACHE: ${{ inputs.cvmfs_alien_cache }} CVMFS_ALT_ROOT_PATH: ${{ inputs.cvmfs_alt_root_path }} CVMFS_AUTHZ_HELPER: ${{ inputs.cvmfs_authz_helper }} diff --git a/setup-cvmfs.sh b/setup-cvmfs.sh index efbc16d..a904d9c 100755 --- a/setup-cvmfs.sh +++ b/setup-cvmfs.sh @@ -27,11 +27,7 @@ else exit 1 fi -if [ "$1" == "local" ]; then - . createConfig.sh -else - $THIS/createConfig.sh -fi +${ACTION_PATH}/createConfig.sh echo "Run cvmfs_config setup" sudo cvmfs_config setup