package_core/tool: export CORE_BRANCH for ci-builds tracking

Map the target branch for this workflow (HEAD_REF for branch pushes, or
closest branch that contains the tag) to CORE_BRANCH, so it can be used
for ci-builds tracking in the JSON export.

Do the same in the package_tool workflow, where CORE_BRANCH is needed to
link the tool packages to the core version they were built with.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>

Author: pillo79

.github/workflows/package_core.yml

@@ -40,6 +40,9 @@ jobs:
       # Tag (if found) or hash identifying this core build, should be used for
       # user-friendly strings and file names
       CORE_TAG: ${{ env.CORE_TAG }}
+      # Target branch referred to by this workflow (HEAD_REF for branch pushes,
+      # or closest branch that contains the tag), used for ci-builds tracking
+      CORE_BRANCH: ${{ env.CORE_BRANCH }}
       # Hash identifying this core build, should be used for exact version match
       CORE_HASH: ${{ env.CORE_HASH }}
       # JSON describing all boards to build, collected by get_board_details.sh
@@ -80,6 +83,13 @@ jobs:
         run: |
           echo "## Building \`$CORE_VER\`" >> "$GITHUB_STEP_SUMMARY"
           echo "CORE_TAG=$(git describe --tags --exact-match --exclude '*/*' 2>/dev/null || echo $CORE_HASH)" >> "$GITHUB_ENV"
+          if [[ "${{ github.ref_type }}" == "tag" ]]; then
+            BRANCH=$(git branch -r --contains HEAD --sort=-committerdate --format='%(refname:short)' | sed 's|origin/||' | grep -v HEAD | head -1)
+            [[ -n "$BRANCH" ]] || { echo "::error::No branch found containing tag ${{ github.ref_name }}"; exit 1; }
+            echo "CORE_BRANCH=${BRANCH}" >> "$GITHUB_ENV"
+          else
+            echo "CORE_BRANCH=${{ github.head_ref || github.ref_name }}" >> "$GITHUB_ENV"
+          fi
           echo "ALL_BOARD_FQBNS=$(jq -c 'map((. + {link_mode: "static"}), (. + {link_mode: "dynamic"}))' <<< ${ALL_BOARD_DATA})" >> "$GITHUB_ENV"
           echo "ARTIFACTS=$(jq -c '["zephyr"] + (map(.artifact) | unique)' <<< ${ALL_BOARD_DATA})" >> "$GITHUB_ENV"
           echo "SUB_ARCHES=$(jq -c 'map(.subarch) | unique' <<< ${ALL_BOARD_DATA})" >> "$GITHUB_ENV"

.github/workflows/package_tool.yml

@@ -40,10 +40,13 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
       is_release: ${{ steps.set-matrix.outputs.is_release }}
       tool_artifact: ${{ steps.set-matrix.outputs.tool_artifact }}
+      CORE_BRANCH: ${{ steps.set-matrix.outputs.CORE_BRANCH }}
+      CORE_VER: ${{ steps.set-matrix.outputs.CORE_VER }}
     steps:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
+          fetch-tags: true # for get_core_version
           persist-credentials: false
           submodules: 'ignore'
 
@@ -59,16 +62,24 @@ jobs:
               '{include: [{tool: $tool, version: $version}]}')
             echo "tool_artifact=$TOOL-$VERSION" >> "$GITHUB_OUTPUT"
             echo "is_release=${{ github.repository == 'arduino/ArduinoCore-zephyr' }}" >> "$GITHUB_OUTPUT"
+
+            BRANCH=$(git branch -r --contains HEAD --sort=-committerdate --format='%(refname:short)' | sed 's|origin/||' | grep -v HEAD | head -1)
+            [[ -n "$BRANCH" ]] || { echo "::error::No branch found containing tag ${{ github.ref_name }}"; exit 1; }
+            echo "CORE_BRANCH=${BRANCH}" >> "$GITHUB_OUTPUT"
           else
             # build all tools using commit SHA as version
             VERSION=$(git rev-parse --short ${{ github.event.pull_request.head.sha || 'HEAD' }})
             MATRIX=$(for d in tools/*/; do [ -f "$d/go.mod" ] && basename "$d"; done \
               | jq -Rnc --arg version "$VERSION" '{include: [inputs | {tool: ., version: $version}]}')
             echo "tool_artifact=" >> "$GITHUB_OUTPUT"
             echo "is_release=false" >> "$GITHUB_OUTPUT"
+
+            echo "CORE_BRANCH=${{ github.head_ref || github.ref_name }}" >> "$GITHUB_OUTPUT"
           fi
           echo "matrix=$MATRIX" >> "$GITHUB_OUTPUT"
 
+          echo "CORE_VER=$(extra/get_core_version.sh)" >> "$GITHUB_OUTPUT"
+
   # Build and package the tools in parallel according to the matrix, uploading
   # the resulting packages and metadata as artifacts for later use.
 

.github/workflows/upload_json.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'arduino/ArduinoCore-zephyr'
             && github.event.workflow_run.event == 'push'
-            && github.event.workflow_run.head_branch == 'main'
+            && !contains(github.event.workflow_run.head_branch, '/')
             && github.event.workflow_run.conclusion == 'success' }}
     environment:
       name: github-pages