From be6721427195b1d10348a121c20e9f52e99d1836 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 2 Aug 2022 22:16:54 -0500 Subject: [PATCH 1/4] fix: run with action '.' instead of run_local_checkout --- .github/workflows/cvmfs_config_package.yml | 3 +-- .github/workflows/cvmfs_http_proxy.yml | 3 +-- .github/workflows/cvmfs_repositories.yml | 3 +-- .github/workflows/macos.yml | 3 +-- .github/workflows/ubuntu.yml | 4 +--- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cvmfs_config_package.yml b/.github/workflows/cvmfs_config_package.yml index 32f073f..3c6abaa 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..30e28f9 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..9889c87 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..68a8159 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..77b0143 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 ###" From 027d994d8fc57287231d09b949fcc3f01312da49 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 2 Aug 2022 22:17:25 -0500 Subject: [PATCH 2/4] fix: no need to support run_local_checkout --- action.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/action.yml b/action.yml index 35b356f..757cfe9 100644 --- a/action.yml +++ b/action.yml @@ -332,12 +332,7 @@ 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 }} From 8a16805171b06953be4770f2045b9c8bb001ca54 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 2 Aug 2022 22:17:59 -0500 Subject: [PATCH 3/4] feat: rename $THIS to $ACTION_PATH as github.action_path --- action.yml | 2 +- setup-cvmfs.sh | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/action.yml b/action.yml index 757cfe9..3120fa8 100644 --- a/action.yml +++ b/action.yml @@ -335,7 +335,7 @@ runs: ${{ 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 From a8a426c015bd4c53d4685bf8d039aaafebc67b4a Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 2 Aug 2022 22:22:31 -0500 Subject: [PATCH 4/4] fix: uses ./ instead of simply uses . --- .github/workflows/cvmfs_config_package.yml | 2 +- .github/workflows/cvmfs_http_proxy.yml | 2 +- .github/workflows/cvmfs_repositories.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cvmfs_config_package.yml b/.github/workflows/cvmfs_config_package.yml index 3c6abaa..a67be97 100644 --- a/.github/workflows/cvmfs_config_package.yml +++ b/.github/workflows/cvmfs_config_package.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: . + - uses: ./ with: cvmfs_repositories: 'pilot.eessi-hpc.org' cvmfs_http_proxy: 'DIRECT' diff --git a/.github/workflows/cvmfs_http_proxy.yml b/.github/workflows/cvmfs_http_proxy.yml index 30e28f9..65495cc 100644 --- a/.github/workflows/cvmfs_http_proxy.yml +++ b/.github/workflows/cvmfs_http_proxy.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: . + - uses: ./ with: cvmfs_http_proxy: 'auto' - name: Setup CernVM-FS diff --git a/.github/workflows/cvmfs_repositories.yml b/.github/workflows/cvmfs_repositories.yml index 9889c87..246c7da 100644 --- a/.github/workflows/cvmfs_repositories.yml +++ b/.github/workflows/cvmfs_repositories.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: . + - uses: ./ with: cvmfs_repositories: 'grid.cern.ch' - name: Test CernVM-FS diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 68a8159..1ed1c7b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,7 +13,7 @@ jobs: os: [macos-latest, macos-10.15, macos-11] steps: - uses: actions/checkout@v2 - - uses: . + - uses: ./ with: cvmfs_repositories: 'sft.cern.ch' - name: Test CernVM-FS diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 77b0143..620c0be 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -13,7 +13,7 @@ jobs: os: [ubuntu-latest, ubuntu-18.04, ubuntu-20.04] steps: - uses: actions/checkout@v2 - - uses: . + - uses: ./ - name: Test CernVM-FS run: | echo "### Dump default.local ###"