From: Flole Date: Tue, 14 Jul 2026 12:59:11 +0000 (+0200) Subject: Disable Pcloud downloads in GH actions to rely on native cache X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Ffix-staticlib-cache-keys;p=thirdparty%2Ftvheadend.git Disable Pcloud downloads in GH actions to rely on native cache --- diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index d1ee82e0c..1e975a31b 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -193,7 +193,7 @@ jobs: - name: Setup container run: | docker pull ${{ matrix.container[0] }} - docker run --name build-container -d -v ${{ github.workspace }}:/workspace ${{ matrix.container[0] }} tail -f /dev/null + docker run --name build-container -d -e GITHUB_ACTIONS=true -v ${{ github.workspace }}:/workspace ${{ matrix.container[0] }} tail -f /dev/null - name: Fix old debian apt if: matrix.container[0] == 'debian:stretch' || matrix.container[0] == 'i386/debian:stretch' || matrix.container[0] == 'debian:buster' || matrix.container[0] == 'i386/debian:buster' env: diff --git a/.github/workflows/build-cloudsmith.yml b/.github/workflows/build-cloudsmith.yml index 96dc3358a..5efdafaa5 100644 --- a/.github/workflows/build-cloudsmith.yml +++ b/.github/workflows/build-cloudsmith.yml @@ -133,6 +133,7 @@ jobs: CLOUDSMITH_API_KEY: "${{ secrets.CLOUDSMITH_KEY }}" PCLOUD_TOKEN: "${{ secrets.PCLOUD_TOKEN }}" NODIRTY: "${{ secrets.NODIRTY }}" + GITHUB_ACTIONS: "true" # The shell to run commands with in the container @@ -201,7 +202,7 @@ jobs: - name: Setup container run: | docker pull ${{ matrix.container[0] }} - docker run --name build-container -d -v ${{ github.workspace }}:/workspace ${{ matrix.container[0] }} tail -f /dev/null + docker run --name build-container -d -e GITHUB_ACTIONS=true -v ${{ github.workspace }}:/workspace ${{ matrix.container[0] }} tail -f /dev/null - name: Fix old debian apt if: matrix.container[0] == 'debian:stretch' || matrix.container[0] == 'i386/debian:stretch' || matrix.container[0] == 'debian:buster' || matrix.container[0] == 'i386/debian:buster' env: diff --git a/support/lib.sh b/support/lib.sh index 4fcc907f0..37e71f083 100755 --- a/support/lib.sh +++ b/support/lib.sh @@ -99,6 +99,9 @@ function download # Attempt to fetch N="${PCLOUD_BASEDIR}/staticlib/${CODENAME}/${ARCH}/${LIB_NAME}-${LIB_HASH}.tgz" + # GitHub Actions skips downloading from pcloud and relies on actions/cache + [ "$GITHUB_ACTIONS" = "true" ] && return 1 + echo "DOWNLOAD ${N} / ${PCLOUD_HASHDIR}" ${ROOTDIR}/support/pcloud.py publink_download "${PCLOUD_HASHDIR}" "${N}" "${P}.tmp" || python3 ${ROOTDIR}/support/pcloud.py publink_download "${PCLOUD_HASHDIR}" "${N}" "${P}.tmp"