diff --git a/.github/workflows/doctest.yaml b/.github/workflows/doctest.yaml index 5b42537..22a0eb9 100644 --- a/.github/workflows/doctest.yaml +++ b/.github/workflows/doctest.yaml @@ -11,9 +11,9 @@ jobs: RELEASE: ['/cvmfs/sw-nightlies.hsf.org/key4hep'] PAGE: ['doc/starterkit/k4SimDelphes/Readme.md'] steps: - - uses: actions/checkout@v2 - - uses: cvmfs-contrib/github-action-cvmfs@v2 - - uses: aidasoft/run-lcg-view@v3 + - uses: actions/checkout@v3 + - uses: cvmfs-contrib/github-action-cvmfs@v3 + - uses: aidasoft/run-lcg-view@v4 with: container: centos7 view-path: ${{ matrix.RELEASE }} diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 3d27778..7cf541f 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -6,17 +6,21 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: cvmfs-contrib/github-action-cvmfs@v2 - - uses: aidasoft/run-lcg-view@v3 + - uses: actions/checkout@v3 + - uses: cvmfs-contrib/github-action-cvmfs@v3 + - uses: aidasoft/run-lcg-view@v4 with: - release-platform: LCG_101/x86_64-centos7-clang12-opt + release-platform: LCG_102/x86_64-centos7-clang12-opt run: | + echo "::group::Setup pre-commit" export PYTHONPATH=$(python -m site --user-site):$PYTHONPATH export PATH=/root/.local/bin:$PATH - pip install --upgrade --user pip - pip install argparse --user - pip install pre-commit --user + pip install pre-commit + # Use virtualenv from the LCG release + pip uninstall --yes virtualenv + echo "::endgroup::" + echo "::group::Run pre-commit" pre-commit run --show-diff-on-failure \ --color=always \ --all-files + echo "::endgroup::" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3471c65..a81c019 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,8 +10,8 @@ jobs: matrix: SETUP: ['/cvmfs/sw.hsf.org/key4hep/setup.sh', '/cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh'] steps: - - uses: actions/checkout@v2 - - uses: cvmfs-contrib/github-action-cvmfs@v2 + - uses: actions/checkout@v3 + - uses: cvmfs-contrib/github-action-cvmfs@v3 - name: Start container run: | docker run -it --name CI_container -v ${GITHUB_WORKSPACE}:/Package -v /cvmfs:/cvmfs:shared -d ghcr.io/aidasoft/centos7:latest /bin/bash