Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
keithm-xmos committed Jun 30, 2023
2 parents e68d139 + 271df19 commit cd02573
Show file tree
Hide file tree
Showing 435 changed files with 8,061 additions and 15,789 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_issue.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Bug report
about: Create a bug report to help us improve the SDK
about: Create a bug report to help us improve XCORE-IOT
title: ''
labels: type:bug
assignees: keithm-xmos
Expand All @@ -10,7 +10,7 @@ assignees: keithm-xmos
**System information**
- OS: [e.g. Mac, Linux, Windows]
- xcore board [e.g. Explorer, Osprey]
- SDK version tag or commit SHA
- Version tag or commit SHA

**Describe the current behavior**

Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/build_installation_issue.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Build or install issue
about: Create a report to help us improve the SDK
about: Create a report to help us improve XCORE-IOT
title: ''
labels: type:build/install
assignees: keithm-xmos
Expand All @@ -9,7 +9,7 @@ assignees: keithm-xmos

**System information**
- OS: [e.g. Mac, Linux, Windows]
- SDK version tag or commit SHA
- Version tag or commit SHA

**Describe the problem**

Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/documentation_issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ assignees: keithm-xmos

---

Thank you for submitting an SDK documentation issue. Please provide as much information you can.
Thank you for submitting an XCORE-IOT documentation issue. Please provide as much information you can.

**System information**
- OS: [e.g. Mac, Linux, Windows]
- xcore board [e.g. Explorer, Osprey]
- SDK version tag or commit SHA
- Version tag or commit SHA

**Describe the documentation issue**

Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
name: Feature request
about: Suggest a new feature for the SDK
about: Suggest a new feature for XCORE-VOICE
title: ''
labels: type:enhancement
assignees: keithm-xmos

---

Thank you for submitting an SDK feature request. Please provide as much information you can.
Thank you for submitting a feature request. Please provide as much information you can.

**Describe the feature**

Expand Down
80 changes: 51 additions & 29 deletions .github/workflows/ci_examples.yml → .github/workflows/apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,46 @@
#
# This file contains the workflows that are run prior to merging a pull request.

name: CI - Examples
name: Build Applications

on:
push:
branches:
- 'main'
- 'develop'
pull_request:
branches:
- 'main'
- 'develop'

# Allow manually triggering of the workflow.
workflow_dispatch: {}
workflow_dispatch:

# Allow workflow to be called from another.
workflow_call:
inputs:
is_release:
description: "Indicates whether this run is for a release or not."
type: string
required: true
default: "false"
examples_artifact_name:
description: 'The name to be given to the uploaded "example apps" artifact.'
type: string
required: true
default: ""

env:
SDK_BUILDER_IMAGE: 'ghcr.io/xmos/sdk_app_builder:develop'
XCORE_BUILDER: 'ghcr.io/xmos/xcore_builder:latest'

jobs:
build_host_apps:
name: Build host applications
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

- name: Pull SDK builder
- name: Pull Docker builder
run: |
docker pull ${SDK_BUILDER_IMAGE}
docker pull ${XCORE_BUILDER}
- name: Build
run: |
docker run --rm -w /xcore_sdk -v ${{github.workspace}}:/xcore_sdk ${SDK_BUILDER_IMAGE} bash -l tools/ci/build_host_apps.sh
docker run --rm -u $(id -u):$(id -g) -w /xcore_iot -v ${{github.workspace}}:/xcore_iot ${XCORE_BUILDER} bash -l tools/ci/build_host_apps.sh
- name: Upload artifacts
uses: actions/upload-artifact@v3
Expand All @@ -57,13 +62,13 @@ jobs:
needs: build_host_apps
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

- name: Pull SDK builder
- name: Pull Docker builder
run: |
docker pull ${SDK_BUILDER_IMAGE}
docker pull ${XCORE_BUILDER}
- name: Download host build artifacts
uses: actions/download-artifact@v3
Expand All @@ -73,7 +78,7 @@ jobs:

- name: Build
run: |
docker run --rm -w /xcore_sdk -v ${{github.workspace}}:/xcore_sdk ${SDK_BUILDER_IMAGE} bash -l tools/ci/build_rtos_core_examples.sh
docker run --rm -u $(id -u):$(id -g) -w /xcore_iot -v ${{github.workspace}}:/xcore_iot ${XCORE_BUILDER} bash -l tools/ci/build_rtos_core_examples.sh
- name: Upload artifacts
uses: actions/upload-artifact@v3
Expand All @@ -90,13 +95,13 @@ jobs:
needs: build_host_apps
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

- name: Pull SDK builder
- name: Pull Docker builder
run: |
docker pull ${SDK_BUILDER_IMAGE}
docker pull ${XCORE_BUILDER}
- name: Download host build artifacts
uses: actions/download-artifact@v3
Expand All @@ -106,7 +111,7 @@ jobs:

- name: Build
run: |
docker run --rm -w /xcore_sdk -v ${{github.workspace}}:/xcore_sdk ${SDK_BUILDER_IMAGE} bash -l tools/ci/build_rtos_aiot_examples.sh
docker run --rm -u $(id -u):$(id -g) -w /xcore_iot -v ${{github.workspace}}:/xcore_iot ${XCORE_BUILDER} bash -l tools/ci/build_rtos_aiot_examples.sh
- name: Upload artifacts
uses: actions/upload-artifact@v3
Expand All @@ -122,20 +127,37 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: recursive

- name: Pull SDK builder
- name: Pull Docker builder
run: |
docker pull ${SDK_BUILDER_IMAGE}
docker pull ${XCORE_BUILDER}
- name: Build
run: |
docker run --rm -w /xcore_sdk -v ${{github.workspace}}:/xcore_sdk ${SDK_BUILDER_IMAGE} bash -l tools/ci/build_metal_examples.sh
docker run --rm -u $(id -u):$(id -g) -w /xcore_iot -v ${{github.workspace}}:/xcore_iot ${XCORE_BUILDER} bash -l tools/ci/build_metal_examples.sh
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: bare-metal_examples
path: ./dist/*.xe
path: ./dist/*.xe

build_rtos_tusb_demos:
name: Build TinyUSB tests
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
submodules: recursive

- name: Pull Docker builder
run: |
docker pull ${XCORE_BUILDER}
- name: Build
run: |
docker run --rm -u $(id -u):$(id -g) -w /xcore_iot -v ${{github.workspace}}:/xcore_iot ${XCORE_BUILDER} bash -l tools/ci/build_rtos_usb_tests.sh
52 changes: 0 additions & 52 deletions .github/workflows/build-push-gh-packages.yml

This file was deleted.

Loading

0 comments on commit cd02573

Please sign in to comment.