Gh ci

.github/workflows/build.yml

@@ -1,41 +1,40 @@
-name: Build
+name: Build native Zephyr samples
 
 on: [push, pull_request]
 
 jobs:
   build:
+    name: Build native Zephyr samples
     runs-on: ubuntu-latest
     container: zephyrprojectrtos/ci:latest
     env:
       CMAKE_PREFIX_PATH: /opt/toolchains
+      CCACHE_IGNOREOPTIONS: -specs=*
+      REPOSITORY: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
+      BRANCH: ${{ github.event.pull_request.head.ref || github.ref_name }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: ArduinoCore-zephyr
-
       - name: Initialize
-        working-directory: ArduinoCore-zephyr
         run: |
           mkdir build && cd build
-          west init -m https://github.com/arduino/ArduinoCore-zephyr.git
-          west update
-          rm -rf modules/lib/ArduinoCore-zephyr/*
-          cp -r ../* modules/lib/ArduinoCore-zephyr || true
-          rm modules/lib/ArduinoCore-zephyr/cores/arduino/api
-          cp -r modules/lib/ArduinoCore-API/api modules/lib/ArduinoCore-zephyr/cores/arduino/api
+          west init -m https://github.com/${{ env.REPOSITORY }} --mr ${{ env.BRANCH }}
+          west update -o=--filter=tree:0
+
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          verbose: 1
 
       - name: Build fade
-        working-directory: ArduinoCore-zephyr/build
+        working-directory: build
         run: |
-          west build -p -b arduino_nano_33_ble//sense ../samples/fade
+          west build -p -b arduino_nano_33_ble//sense modules/lib/ArduinoCore-zephyr/samples/fade
 
       - name: Build i2cdemo
-        working-directory: ArduinoCore-zephyr/build
+        working-directory: build
         run: |
-          west build -p -b ek_ra8d1 ../samples/i2cdemo
+          west build -p -b ek_ra8d1 modules/lib/ArduinoCore-zephyr/samples/i2cdemo
 
       - name: Build adc
-        working-directory: ArduinoCore-zephyr/build
+        working-directory: build
         run: |
-          west build -p -b arduino_nano_33_ble//sense ../samples/analog_input
+          west build -p -b arduino_nano_33_ble/nrf52840/sense modules/lib/ArduinoCore-zephyr/samples/analog_input

.github/workflows/package_core.yml

@@ -1,32 +1,187 @@
-name: Package core
+name: Package, test and upload core
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - arduino
+  pull_request:
 
 jobs:
-  build:
+
+  package-core:
+    name: Build and package core
     runs-on: ubuntu-latest
     env:
       ZEPHYR_SDK_INSTALL_DIR: /opt/zephyr-sdk-0.16.8
+      CCACHE_IGNOREOPTIONS: -specs=*
+    outputs:
+      CORE_TAG: ${{ env.CORE_TAG }}
+      CORE_ARTIFACT: ${{ env.CORE_ARTIFACT }}
+      BOARD_NAMES: ${{ env.BOARD_NAMES }}
     steps:
       - name: Install toolchain
         working-directory: /opt
         run: |
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends git cmake wget python3-pip ninja-build
-          wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/zephyr-sdk-0.16.8_linux-x86_64_minimal.tar.xz
+          sudo apt-get install -y --no-install-recommends git cmake wget python3-pip ninja-build ccache
+          wget -nv https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/zephyr-sdk-0.16.8_linux-x86_64_minimal.tar.xz
           tar xf zephyr-sdk-0.16.8_linux-x86_64_minimal.tar.xz && cd zephyr-sdk-0.16.8 && ./setup.sh -t arm-zephyr-eabi -c
 
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          persist-credentials: false
 
       - name: Initialize
         run: |
-          ./extra/bootstrap.sh
-          ./extra/build_all.sh
-          ./extra/package.sh `git describe --always`
-          mv ../arduino-core-zephyr-llext* .
+          ./extra/bootstrap.sh -o=--filter=tree:0
+          echo "CORE_TAG=$(git describe --always)" >> "$GITHUB_ENV"
+          echo "CORE_ARTIFACT=ArduinoCore-zephyr-$(git describe --always)" >> "$GITHUB_ENV"
+          echo "BOARD_NAMES=[ $(cat boards.txt | grep '^[^#]*\.build\.variant' | cut -d '.' -f 1 | xargs printf '"%s",' | sed -e 's/,$//') ]" >> "$GITHUB_ENV"
+
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          verbose: 1
+
+      - name: Build variants
+        run: |
+          ./extra/build_all.sh -f
+
+      - name: Package
+        run: |
+          ./extra/package.sh ${{ env.CORE_TAG }}
+          mv ../${{ env.CORE_ARTIFACT }}.tar.bz2 .
 
       - name: Archive core
         uses: actions/upload-artifact@v4
         with:
-          name: Core
-          path: arduino-core-zephyr-llext*
+          name: ${{ env.CORE_ARTIFACT }}
+          path: ${{ env.CORE_ARTIFACT }}.tar.bz2
+
+  test-core:
+    name: Test arduino:zephyr:${{ matrix.board }}
+    runs-on: ubuntu-latest
+    needs: package-core
+    strategy:
+      matrix:
+        board: ${{ fromJSON( needs.package-core.outputs.BOARD_NAMES ) }}
+      fail-fast: false
+    env:
+      FQBN: arduino:zephyr:${{ matrix.board }}
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: ${{ needs.package-core.outputs.CORE_ARTIFACT }}
+
+      - name: Set up core
+        run: |
+          tar xf ${{ needs.package-core.outputs.CORE_ARTIFACT }}.tar.bz2
+
+      - name: Create Blink sketch
+        run: |
+          mkdir Blink/
+          wget -nv https://raw.githubusercontent.com/arduino/arduino-examples/refs/heads/main/examples/01.Basics/Blink/Blink.ino -P Blink/
+
+      - name: Compile Blink for ${{ env.FQBN }}
+        uses: pillo79/compile-sketches@main
+        with:
+          fqbn: ${{ env.FQBN }}
+          platforms: |
+            # Use Board Manager to install the latest release of Arduino Zephyr Boards to get the toolchain
+            - name: "arduino:zephyr"
+              source-url: "https://downloads.arduino.cc/packages/package_zephyr_index.json"
+            - name: "arduino:zephyr"
+              source-path: "ArduinoCore-zephyr"
+          sketch-paths: Blink
+          verbose: 'false'
+          enable-deltas-report: 'false'
+          enable-warnings-report: 'true'
+          enable-warnings-log: 'true'
+
+      - name: Clean up log
+        run: |
+            sed -i -e 's!/home/runner/.arduino15/packages/arduino/hardware/zephyr/[^/]*/!!g' sketches-reports/*
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: test-report-${{ needs.package-core.outputs.CORE_TAG }}-${{ matrix.board }}
+          path: sketches-reports/*
+
+  collect-logs:
+    name: Test summary
+    runs-on: ubuntu-latest
+    needs:
+      - package-core
+      - test-core
+    if: ${{ !cancelled() && needs.package-core.result == 'success' }}
+    env:
+      BOARD_NAMES: ${{ needs.package-core.outputs.BOARD_NAMES }}
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          path: .
+          pattern: test-report-*
+          merge-multiple: true
+
+      - run: |
+          echo "### Core test results" >> "$GITHUB_STEP_SUMMARY"
+          for BOARD in $(echo $BOARD_NAMES | jq -cr '.[]'); do
+            FQBN="arduino:zephyr:$BOARD"
+            REPORT_FILE="arduino-zephyr-$BOARD.json"
+            if [ ! -f $REPORT_FILE ]; then
+              echo ":x: $BOARD - No report found?" >> "$GITHUB_STEP_SUMMARY"
+            else
+              REPORT=$(jq -cr '.boards[0].sketches[0]' $REPORT_FILE)
+              if ! $(echo $REPORT | jq -cr '.compilation_success') ; then
+                echo ":x: $BOARD - **Build failed**" >> "$GITHUB_STEP_SUMMARY"
+              else
+                WARNINGS=$(echo $REPORT | jq -cr '.warnings.current.absolute // 0')
+                if [ $WARNINGS -eq 0 ]; then
+                  echo ":white_check_mark: $BOARD - Build successful" >> "$GITHUB_STEP_SUMMARY"
+                else
+                  echo "<details><summary>:warning: $BOARD - $WARNINGS Warnings:</summary>" >> "$GITHUB_STEP_SUMMARY"
+                  echo >> "$GITHUB_STEP_SUMMARY"
+                  echo "\`\`\`" >> "$GITHUB_STEP_SUMMARY"
+                  echo $REPORT | jq -cr '.warnings_log[]' >> "$GITHUB_STEP_SUMMARY"
+                  echo "\`\`\`" >> "$GITHUB_STEP_SUMMARY"
+                  echo >> "$GITHUB_STEP_SUMMARY"
+                  echo "</details>" >> "$GITHUB_STEP_SUMMARY"
+                fi
+              fi
+            fi
+          done
+
+  publish-artifacts:
+    name: Publish artifacts
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' && github.repository == 'arduino/ArduinoCore-zephyr' }}
+    needs:
+      - package-core
+      - test-core
+    env:
+      CORE_ARTIFACT: ${{ needs.package-core.outputs.CORE_ARTIFACT }}
+      CORE_TAG: ${{ needs.package-core.outputs.CORE_TAG }}
+      PACKAGE_INDEX_JSON: zephyr-core-${{ needs.package-core.outputs.CORE_TAG }}.json
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.CORE_ARTIFACT }}
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.IAM_ROLE }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Upload artifact
+        run: aws s3 sync ${{ env.CORE_ARTIFACT }}.tar.bz2 s3://${{ secrets.S3_BUCKET }}
+
+      - name: Prepare package index snippet
+        run: ./extra/gen_package_index_json.sh
+
+      - name: Archive package index snippet
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.PACKAGE_INDEX_JSON }}
+          path: ${{ env.PACKAGE_INDEX_JSON }}

CMakeLists.txt

@@ -12,7 +12,7 @@ if (CONFIG_ARDUINO_API)
 endif()
 endif()
 
-if (CONFIG_ARDUINO_API)
+if (CONFIG_ARDUINO_API AND NOT CONFIG_LLEXT)
 add_subdirectory(cores)
 add_subdirectory(libraries)
 zephyr_include_directories(${variant_dir})

Kconfig

@@ -31,3 +31,23 @@ config ARDUINO_ENTRY
 	default y
 
 endif
+
+if USB_DEVICE_STACK_NEXT
+
+config USB_DEVICE_PRODUCT
+	string "USB Device Product"
+	default "Arduino Generic board"
+
+config USB_DEVICE_MANUFACTURER
+	string "USB Device Manufacturer"
+	default "Arduino"
+
+config USB_DEVICE_VID
+	hex "USB Device Vendor ID"
+	default 0x2341
+
+config USB_DEVICE_PID
+	hex "USB Device Product ID"
+	default 0x0001
+
+endif