Add psoc e84 ai kit

.github/dependabot.yml

@@ -0,0 +1,29 @@
+# Autogenerated by extra/ci_dependabot_config.sh - DO NOT EDIT"
+
+version: 2
+updates:
+
+  - package-ecosystem: "gomod"
+    directory: "/tools/bin2uf2"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "gomod"
+    directory: "/tools/gen-rodata-ld"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "gomod"
+    directory: "/tools/sync-zephyr-artifacts"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "gomod"
+    directory: "/tools/zephyr-check-size"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "gomod"
+    directory: "/tools/zephyr-sketch-tool"
+    schedule:
+      interval: "weekly"

.github/workflows/build.yml

@@ -54,14 +54,18 @@ jobs:
         run: |
           echo EXTRA_ZEPHYR_MODULES="$(pwd)/$MODULE_PATH" >> $GITHUB_ENV
 
-      - name: Build fade
+      - name: Apply Zephyr patches
         run: |
-          west build -p -b arduino_nano_33_ble//sense $MODULE_PATH/samples/fade
+          bash $MODULE_PATH/extra/apply_zephyr_patches.sh
 
-      - name: Build i2cdemo
+      - name: Build blinky
         run: |
-          west build -p -b ek_ra8d1 $MODULE_PATH/samples/i2cdemo
+          west build -p -b kit_pse84_ai/pse846gps2dbzc4a/m33 $MODULE_PATH/samples/blinky_arduino
 
-      - name: Build adc
+      - name: Build hello
         run: |
-          west build -p -b arduino_nano_33_ble/nrf52840/sense $MODULE_PATH/samples/analog_input
+          west build -p -b kit_pse84_ai/pse846gps2dbzc4a/m33 $MODULE_PATH/samples/hello_arduino
+
+      - name: Build threads
+        run: |
+          west build -p -b kit_pse84_ai/pse846gps2dbzc4a/m33 $MODULE_PATH/samples/threads_arduino

.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"
@@ -111,7 +121,7 @@ jobs:
   # for later jobs.
 
   build-board:
-    # NOTE: this name is hardcoded in ci_inspect_logs.py
+    # NOTE: this name is hardcoded in ci_collect_data.py
     name: Build for ${{ matrix.board }}
     runs-on: ubuntu-latest
     needs:
@@ -197,9 +207,11 @@ jobs:
 
           # Preprare an archive of the built binaries (and build dir on failure)
           [ "${{ job.status }}" == "failure" ] && FULL_BUILD_DIR="build/${{ matrix.variant }}/"
+          sed -e '/^#/d' boards.local.txt > boards.local_${{ matrix.variant }}.txt
           tar chf - \
             firmwares/*${{ matrix.variant }}* \
             variants/${{ matrix.variant }}/ \
+            boards.local_${{ matrix.variant }}.txt \
             ${FULL_BUILD_DIR} \
           | zstd > binaries-${ARTIFACT_TAG}.tar.zstd
 
@@ -273,6 +285,7 @@ jobs:
           for f in binaries-*.tar.zstd ; do
             tar --use-compress-program=unzstd -xpf $f
           done
+          cat $(ls boards.local_*.txt | sort) >> boards.local.txt
           # Create the core artifact for this set of boards
           ./extra/package_core.sh ${{ matrix.artifact }} ${CORE_TAG} distrib/${CORE_ARTIFACT}
 
@@ -310,7 +323,7 @@ jobs:
   # This step never fails, so that expected errors do not block the CI run.
 
   test-core:
-    # NOTE: this name is hardcoded in ci_inspect_logs.py
+    # NOTE: this name is hardcoded in ci_collect_data.py
     name: Test ${{ matrix.board }}:${{ matrix.link_mode }}
     runs-on: ubuntu-latest
     needs:
@@ -347,6 +360,21 @@ jobs:
           tar xf ${CORE_ARTIFACT} # will create ArduinoCore-zephyr/
           echo "REPORT_FILE=$(echo ${FQBN} | tr ':' '-').json" >> $GITHUB_ENV
 
+      - name: Install arm-zephyr-eabi 1.0.1 for zephyr_contrib boards
+        # zephyr_contrib boards (e.g. kit_pse84_ai) use Zephyr 4.4.0 + SDK 1.0.1.
+        # The Board Manager only ships arm-zephyr-eabi-0.16.8 (for SDK 0.16.8/Zephyr 4.2.0).
+        # We install 1.0.1 manually into the arduino-cli packages path so that
+        # {runtime.tools.arm-zephyr-eabi-1.0.1.path} resolves correctly during compilation.
+        if: ${{ matrix.subarch == 'zephyr_contrib' }}
+        run: |
+          TOOL_DIR=~/.arduino15/packages/zephyr/tools/arm-zephyr-eabi/1.0.1
+          if [ ! -d "$TOOL_DIR/bin" ]; then
+            mkdir -p "$TOOL_DIR"
+            wget -q https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v1.0.1/toolchain_gnu_linux-x86_64_arm-zephyr-eabi.tar.xz -O /tmp/arm-zephyr-eabi.tar.xz
+            tar -xf /tmp/arm-zephyr-eabi.tar.xz -C "$TOOL_DIR" --strip-components=1
+            rm /tmp/arm-zephyr-eabi.tar.xz
+          fi
+
       - name: Get test sketches
         run: |
           # sets ALL_TESTS and ALL_LIBRARIES env vars in GITHUB_ENV
@@ -395,7 +423,7 @@ jobs:
 
 
   # Collect all build and test reports, analyze them and produce a summary.
-  # See ci_inspect_logs.py for details.
+  # See ci_collect_data.py and ci_generate_report.py for details.
 
   verify-core:
     runs-on: ubuntu-latest
@@ -429,8 +457,9 @@ jobs:
           export WORKFLOW_JOBS=$(gh run view ${{ github.run_id }} --attempt ${{ github.run_attempt }} --json jobs --jq '.jobs')
           # Archive the input set of reports for later inspection
           tar jchf build-reports-${{ needs.build-env.outputs.CORE_HASH }}.tar.bz2 zephyr-* arduino-*.json
-          # Run the log inspection script
-          extra/ci_inspect_logs.py result summary full_log
+          # Collect all CI data into a JSON file, then generate the report
+          extra/ci_collect_data.py build_info.json
+          extra/ci_generate_report.py build_info.json result summary full_log
           cat result
 
           # Display the summary and full log in the step summary
@@ -458,6 +487,14 @@ jobs:
           # errors due to race conditions with parallel branch runs should not fail the job
           extra/ci_calc_size_reports.py ${GITHUB_BASE_SHA} sketches-reports/ || true
 
+      # upload build metadata artifact, for upload to ci-builds
+      - name: Archive build metadata information
+        uses: actions/upload-artifact@v7
+        with:
+          name: build-metadata
+          path: build_info.json
+          retention-days: 1
+
       # upload comment request artifact (will be retrieved by leave_pr_comment.yml)
       - name: Archive comment information
         uses: actions/upload-artifact@v7
@@ -589,22 +626,48 @@ jobs:
 
       - uses: actions/download-artifact@v8
         with:
+          pattern: ArduinoCore-*.tar.bz2
           path: .
-          pattern: ArduinoCore-*
           merge-multiple: true
 
+      - uses: actions/download-artifact@v8
+        with:
+          name: build-metadata
+          path: snippets/metadata/
+
       - name: Prepare package index snippets
         run: |
+          mkdir -p snippets/platforms/
           jq -cr '.[]' <<< ${ARTIFACTS} | while read -r artifact; do
             # note: the archive names are always hash-based so they use a
             # predictable pattern. JSON files can use the tag for user-friendliness.
             ARTIFACT_FILE=ArduinoCore-${artifact}-${CORE_HASH}.tar.bz2
-            PACKAGE_JSON=ArduinoCore-${artifact}-${CORE_TAG}.json
+            PACKAGE_JSON=snippets/platforms/ArduinoCore-${artifact}-${CORE_TAG}.json
             ./extra/gen_package_index_json.sh ${artifact} ${ARTIFACT_FILE} ${PACKAGE_JSON}
           done
 
       - name: Archive package index snippets
         uses: actions/upload-artifact@v7
         with:
-          name: ArduinoCore-zephyr-${{ env.CORE_TAG }}-jsons
-          path: ArduinoCore-*-${{ env.CORE_TAG }}.json
+          name: snippets-${{ env.CORE_TAG }}
+          path: snippets/
+
+  ci-builds-upload:
+    name: Upload to ci-builds
+    if: ${{ github.event_name == 'push' && github.repository == 'arduino/ArduinoCore-zephyr' }}
+    runs-on: ubuntu-latest
+    needs:
+      - build-env
+      - verify-core
+      - prepare-json
+    permissions:
+      id-token: write   # required to obtain the OIDC token
+    steps:
+      # Run the composite action in this context to create a proper OIDC token
+      # for this repo and start the internal workflows.
+      - uses: arduino/core-ci-builds@main
+        with:
+          token: ${{ secrets.CI_BUILDS_TOKEN }}
+          version: ${{ needs.build-env.outputs.CORE_VER }}
+          artifact: snippets-${{ needs.build-env.outputs.CORE_TAG }}
+          base-branch: ${{ needs.build-env.outputs.CORE_BRANCH }}

.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,35 @@ 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"
+
+      - name: Verify dependabot config
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          # Check that the dependabot config is exactly as generated by extra/ci_dependabot_config.sh, to avoid
+          # accidentally breaking it and leaving the tools unmaintained.
+          extra/ci_dependabot_config.sh /tmp/expected_dependabot.yml
+          if ! cmp -s /tmp/expected_dependabot.yml .github/dependabot.yml; then
+            echo "::error::Dependabot config is not up to date. Please run extra/ci_dependabot_config.sh and commit the changes."
+            exit 1
+          fi
+
   # Build and package the tools in parallel according to the matrix, uploading
   # the resulting packages and metadata as artifacts for later use.
 
@@ -91,7 +113,12 @@ jobs:
           cache: false
 
       - name: Build and package tool
-        run: extra/package_tool.sh tools/${{ matrix.tool }} ${{ matrix.version }}
+        run: |
+          mkdir -p snippets/tools snippets/metadata
+          extra/package_tool.sh tools/${{ matrix.tool }} ${{ matrix.version }}
+          mv distrib/*.json snippets/tools/
+          # metadata dir is empty, but is still required to preserve the
+          # directory structure in the generated artifacts
 
       - name: Upload tool artifact
         uses: actions/upload-artifact@v7
@@ -102,12 +129,11 @@ jobs:
             distrib/*.zip
           retention-days: 7
 
-      - name: Upload JSON artifact
+      - name: Upload JSON snippet
         uses: actions/upload-artifact@v7
         with:
-          name: ${{ matrix.tool }}-${{ matrix.version }}.json
-          path: distrib/*.json
-          archive: false
+          name: snippet-${{ matrix.tool }}-${{ matrix.version }}
+          path: snippets/
 
   # Upload the built tool packages to the S3 bucket for public distribution.
 
@@ -156,3 +182,24 @@ jobs:
           # A failure here means either the build or publish step failed when it was expected to run.
           [ ${{ needs.build-tool.result }} == "success" ] && \
             ( [ ${{ needs.publish-tool.result }} == "success" ] || [ ${{ needs.publish-tool.result }} == "skipped" ] )
+
+  ci-builds-upload:
+    name: Upload to ci-builds
+    if: fromJSON(needs.setup.outputs.is_release)
+    runs-on: ubuntu-latest
+    needs:
+      - setup
+      - build-tool
+      - publish-tool
+      - verify-tool
+    permissions:
+      id-token: write   # required to obtain the OIDC token
+    steps:
+      # Run the composite action in this context to create a proper OIDC token
+      # for this repo and start the internal workflows.
+      - uses: arduino/core-ci-builds@main
+        with:
+          token: ${{ secrets.CI_BUILDS_TOKEN }}
+          version: ${{ needs.setup.outputs.CORE_VER }}
+          artifact: snippet-${{ needs.setup.outputs.tool_artifact }}
+          base-branch: ${{ needs.setup.outputs.CORE_BRANCH }}