From dc4ecd05f0176824a542c0de54fba92864c9a53b Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 16 Feb 2026 16:13:51 -0500 Subject: [PATCH] Revert "fix cvmfs github CI issues with 5.4 (#1109)" This reverts commit d87c5592e6d57d9a01b86c7a8fb0f9898b0644d7. See https://github.com/cvmfs-contrib/github-action-cvmfs/issues/59 --- .github/workflows/ci.yml | 12 ++++++------ .../{validation.yml-DISABLED => validation.yml} | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename .github/workflows/{validation.yml-DISABLED => validation.yml} (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ad94e776c..5c46dbf34e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: distribution: ${{ env.java_distribution }} cache: maven - name: setup cvmfs - uses: cvmfs-contrib/github-action-cvmfs@v5.4 + uses: cvmfs-contrib/github-action-cvmfs@v5 with: cvmfs_repositories: 'oasis.opensciencegrid.org' - name: cvmfs @@ -128,7 +128,7 @@ jobs: java-version: ${{ matrix.JAVA_VERSION }} distribution: ${{ env.java_distribution }} cache: maven - - uses: cvmfs-contrib/github-action-cvmfs@v5.4 + - uses: cvmfs-contrib/github-action-cvmfs@v5 with: cvmfs_repositories: 'oasis.opensciencegrid.org' - name: unit tests @@ -155,7 +155,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.java_distribution }} cache: maven - - uses: cvmfs-contrib/github-action-cvmfs@v5.4 + - uses: cvmfs-contrib/github-action-cvmfs@v5 with: cvmfs_repositories: 'oasis.opensciencegrid.org' - uses: actions/download-artifact@v7 @@ -177,7 +177,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.java_distribution }} cache: maven - - uses: cvmfs-contrib/github-action-cvmfs@v5.4 + - uses: cvmfs-contrib/github-action-cvmfs@v5 with: cvmfs_repositories: 'oasis.opensciencegrid.org' - uses: actions/download-artifact@v7 @@ -209,7 +209,7 @@ jobs: distribution: ${{ env.java_distribution }} cache: maven - name: setup cvmfs - uses: cvmfs-contrib/github-action-cvmfs@v5.4 + uses: cvmfs-contrib/github-action-cvmfs@v5 with: cvmfs_repositories: 'oasis.opensciencegrid.org' - uses: actions/download-artifact@v7 @@ -265,7 +265,7 @@ jobs: - uses: actions/download-artifact@v7 with: name: build_${{ matrix.runner }} - - uses: cvmfs-contrib/github-action-cvmfs@v5.4 + - uses: cvmfs-contrib/github-action-cvmfs@v5 with: cvmfs_repositories: 'oasis.opensciencegrid.org' - name: untar build diff --git a/.github/workflows/validation.yml-DISABLED b/.github/workflows/validation.yml similarity index 100% rename from .github/workflows/validation.yml-DISABLED rename to .github/workflows/validation.yml