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 d1ee82e0c3ef680fa7f05852294bb08fd967faf0..1e975a31b6475f9734071ad64d3bc49bba48e956 100644 (file)
--- 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 96dc3358a6c4d3ecbc2e5af67c2aeda178677c01..5efdafaa5b1299090c1c9ea44e71b4a33c0b8799 100644 (file)
--- 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 4fcc907f0d17eb406868c89021bd306cb8fc517a..37e71f08329928a24fec65a917563f169ada14ef 100755 (executable)
--- 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"