diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index e72b399d38..ba1da991c6 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Use cached warnings as a baseline
         shell: bash
         run: cp warnings.json ./ci/scripts/warnings_baseline.json
-        if: steps.cache-restore-warnings.outputs.cache-hit == true
+        if: steps.cache-restore-warnings.outputs.cache-hit == 'true'
       - name: Warning report
         shell: bash
         env:
@@ -73,6 +73,6 @@ jobs:
         uses: actions/cache/save@v4
         with:
           path: warnings.json
-          key: ${{ github.event.pull_request.base.sha }}-compile-warnings
+          key: ${{ github.sha }}-compile-warnings
         if: github.ref_name == github.event.repository.default_branch