From e8fa3e9df8ede92aac023af5f192b6256c9d647c Mon Sep 17 00:00:00 2001
From: Pawel Rutka <pawel.rutka.ext@qorix.ai>
Date: Thu, 19 Feb 2026 10:56:05 +0100
Subject: [PATCH] Align caching in workflows

---
 .github/workflows/build_qnx8.yml    |  4 ++++
 .github/workflows/code_coverage.yml |  4 ++--
 .github/workflows/tests.yml         | 28 ----------------------------
 3 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 .github/workflows/tests.yml

diff --git a/.github/workflows/build_qnx8.yml b/.github/workflows/build_qnx8.yml
index 2f279bf3..ea919c1b 100644
--- a/.github/workflows/build_qnx8.yml
+++ b/.github/workflows/build_qnx8.yml
@@ -17,6 +17,9 @@ on:
     types: [opened, reopened, synchronize]
   merge_group:
     types: [checks_requested]
+  push:
+    branches:
+      - main
 jobs:
   qnx-build:
     uses: eclipse-score/cicd-workflows/.github/workflows/qnx-build.yml@main
@@ -31,6 +34,7 @@ jobs:
       bazel-config: ${{ matrix.config }}
       credential-helper: 'scripts/internal/qnx_creds.py'
       environment-name: 'workflow-approval'
+      bazel-disk-cache: ${{ github.workflow }}-${{ github.job }}-${{ matrix.config }}
     secrets:
       score-qnx-license: ${{ secrets.SCORE_QNX_LICENSE }}
       score-qnx-user: ${{ secrets.SCORE_QNX_USER }}
diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml
index a39b60c6..26b20125 100644
--- a/.github/workflows/code_coverage.yml
+++ b/.github/workflows/code_coverage.yml
@@ -38,7 +38,7 @@ jobs:
         uses: bazel-contrib/setup-bazel@0.18.0
         with:
           bazelisk-cache: true
-          disk-cache: ${{ github.job }}
+          disk-cache: ${{ github.workflow }}-${{ github.job }}
           repository-cache: true
           cache-save: ${{ github.event_name == 'push' }}
 
@@ -76,7 +76,7 @@ jobs:
         uses: bazel-contrib/setup-bazel@0.18.0
         with:
           bazelisk-cache: true
-          disk-cache: ${{ github.job }}
+          disk-cache: ${{ github.workflow }}-${{ github.job }}
           repository-cache: true
           cache-save: ${{ github.event_name == 'push' }}
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index dd698c3b..00000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# *******************************************************************************
-# Copyright (c) 2025 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Apache License Version 2.0 which is available at
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# SPDX-License-Identifier: Apache-2.0
-# *******************************************************************************
-
-name: Tests
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-  merge_group:
-    types: [checks_requested]
-jobs:
-  test:
-    name: "Run tests"
-    uses: eclipse-score/cicd-workflows/.github/workflows/tests.yml@main
-    permissions:
-      contents: read
-      pull-requests: read
-    with:
-      bazel-target: 'test //src/... --config=x86_64-linux'