key names

Author: robbycochran

.github/workflows/collector-builder.yml

@@ -78,10 +78,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/builder/.ccache
-          key: builder-ccache-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
+          key: builder-ccache-${{ matrix.arch }}-${{ format('YYYY-MM-DDTHH:mm:ssZ', github.event.head_commit.timestamp) }}
           restore-keys: |
-            builder-ccache-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }}-
-            builder-ccache-${{ matrix.arch }}-master-
+            builder-ccache-${{ matrix.arch }}-
 
       - name: Setup builder ccache in docker cache
         if: |
@@ -173,16 +172,13 @@ jobs:
           (contains(github.event.pull_request.labels.*.name, 'run-multiarch-builds') && matrix.arch == 's390x')
         timeout-minutes: 480
         run: |
-          [ ! -d "${{ github.workspace }}/builder/.ccache" ] && rm -f "${{ github.workspace }}/builder/.ccache"
-          ls -al "${{ github.workspace }}/builder/.ccache" || true
           ansible-playbook \
             -i ansible/ci \
             -e build_hosts='job_id_${{ env.JOB_ID }}' \
             -e arch='${{ matrix.arch }}' \
             -e github_workspace='${{ github.workspace }}' \
             -e @'${{ github.workspace }}/ansible/secrets.yml' \
             ansible/ci-build-builder.yml
-          ls -al "${{ github.workspace }}/builder/.ccache" || true
 
       - name: Destroy VMs
         if: always() && matrix.arch == 's390x'

.github/workflows/collector.yml

@@ -48,10 +48,7 @@ jobs:
       - name: Set up ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ccache-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
-          restore-keys: |
-            ccache-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }}-
-            ccache-${{ matrix.arch }}-master-
+          key: ${{ matrix.arch }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -92,10 +89,6 @@ jobs:
             -e @'${{ github.workspace }}/ansible/secrets.yml' \
             ansible/ci-build-collector.yml
 
-      - name: Stats for ccache after build
-        run: |
-          ccache -s "${{ github.workspace }}/.ccache"
-
   build-collector-image-remote-vm:
     name: Build Collector on a remote VM
     runs-on: ubuntu-latest
@@ -139,10 +132,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/.ccache
-          key: ccache-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
+          key: ccache-${{ matrix.arch }}-${{ format('YYYY-MM-DDTHH:mm:ssZ', github.event.head_commit.timestamp) }}
           restore-keys: |
-            ccache-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }}-
-            ccache-${{ matrix.arch }}-master-
+            ccache-${{ matrix.arch }}-
 
       - name: Create Build VMs
         run: |