Port changes applied to main

Author: pquentin

.github/workflows/validate-pr.yml .github/workflows/validate-apis.yml.github/workflows/validate-pr.yml renamed to .github/workflows/validate-apis.yml

@@ -46,9 +46,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ./clients-flight-recorder/recordings/types-validation/types-validation.json
-          key: types-validation-json-${{ github.event_name == 'pull_request' && format('{0}-{1}', github.head_ref, github.event.pull_request.base.sha) || format('{0}-{1}', github.ref_name, github.sha) }}
+          key: types-validation-json-${{ github.event_name == 'pull_request' && format('{0}-{1}', github.base_ref, github.event.pull_request.base.sha) || format('{0}-{1}', github.ref_name, github.sha) }}
           restore-keys: |
-            types-validation-json-${{ github.event_name == 'pull_request' && github.head_ref || github.ref_name }}-
+            types-validation-json-${{ github.event_name == 'pull_request' && github.base_ref || github.ref_name }}-
 
       - name: Install deps 1/2
         working-directory: ./clients-flight-recorder
@@ -71,11 +71,12 @@ jobs:
       - name: Download artifacts
         working-directory: ./clients-flight-recorder
         run: |
-          if [[ -n "${GITHUB_BASE_REF+x}" ]]; then
+          if [[ -n "${GITHUB_BASE_REF:-}" ]]; then
             branch=$GITHUB_BASE_REF
           else
             branch=$GITHUB_REF_NAME
           fi
+          echo "Using branch: $branch"
           node scripts/upload-recording/download.js --branch $branch --git
           node scripts/clone-elasticsearch/index.js --branch $branch