summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorHa Thach <[email protected]>2024-05-13 20:27:49 +0700
committerGitHub <[email protected]>2024-05-13 20:27:49 +0700
commit7cf1bdd2848d6c36e9659acaf77c83a1fa99d04f (patch)
tree4d0bcaf1854512f19420c6e208985350c522379e /.github/workflows
parent6f47746e5ff6e33b25e12742d62bcbf69f8a27a0 (diff)
Ci tweak3 (#2643)
- enable --one-per-family to build 1 board per family, also skip family if board specified in -b also present - minimize ci run for push event - only build one board per family - skip hil test on both pi4 and hfp - full build will be runn for PR event - IAR always build 1 board per family regardless of event - update build.py to optimize make - remove all setup python since we don't really need it
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/build.yml50
-rw-r--r--.github/workflows/build_iar.yml50
-rw-r--r--.github/workflows/build_renesas.yml5
-rw-r--r--.github/workflows/build_util.yml21
-rw-r--r--.github/workflows/ci_set_matrix.py22
-rw-r--r--.github/workflows/hil_test.yml12
-rw-r--r--.github/workflows/pre-commit.yml5
7 files changed, 68 insertions, 97 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d51e1c92a..2cd348847 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,11 +37,6 @@ jobs:
outputs:
json: ${{ steps.set-matrix-json.outputs.matrix }}
steps:
- - name: Setup Python
- uses: actions/setup-python@v5
- with:
- python-version: '3.x'
-
- name: Checkout TinyUSB
uses: actions/checkout@v4
@@ -63,27 +58,22 @@ jobs:
matrix:
toolchain:
- 'aarch64-gcc'
- - 'arm-clang'
+# - 'arm-clang'
- 'arm-gcc'
- 'msp430-gcc'
- 'riscv-gcc'
- if: >-
- matrix.toolchain != 'arm-clang' ||
- github.event_name == 'pull_request' ||
- (github.event_name == 'push' && github.ref == 'refs/heads/master')
with:
build-system: 'cmake'
toolchain: ${{ matrix.toolchain }}
toolchain_url: ${{ fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].toolchain_url }}
build-args: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].family) }}
+ one-per-family: ${{ github.event_name != 'pull_request' }}
# ---------------------------------------
# Build Make
# ---------------------------------------
make:
- if: >-
- github.event_name == 'pull_request' ||
- (github.event_name == 'push' && github.ref == 'refs/heads/master')
+ #if: github.event_name == 'pull_request'
needs: set-matrix
uses: ./.github/workflows/build_util.yml
strategy:
@@ -100,6 +90,7 @@ jobs:
toolchain: ${{ matrix.toolchain }}
toolchain_url: ${{ fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].toolchain_url }}
build-args: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].family) }}
+ one-per-family: ${{ github.event_name != 'pull_request' }}
# ---------------------------------------
# Build Make on Windows/MacOS
@@ -114,7 +105,8 @@ jobs:
os: ${{ matrix.os }}
build-system: 'make'
toolchain: 'arm-gcc'
- build-args: '["-bstm32f411disco"]'
+ build-args: '["stm32h7"]'
+ one-per-family: true
# ---------------------------------------
# Build Espressif
@@ -134,3 +126,33 @@ jobs:
toolchain: 'esp-idf'
toolchain_url: 'v5.1.1'
build-args: '["-b${{ matrix.board }}"]'
+
+ # ---------------------------------------
+ # Build IAR on HFP self-hosted
+ # ---------------------------------------
+ arm-iar:
+ if: github.repository_owner == 'hathach'
+ needs: set-matrix
+ runs-on: [self-hosted, Linux, X64, hifiphile]
+ env:
+ BUILD_ARGS: ${{ join(fromJSON(needs.set-matrix.outputs.json)['arm-iar'].family, ' ') }}
+ steps:
+ - name: Clean workspace
+ run: |
+ echo "Cleaning up previous run"
+ rm -rf "${{ github.workspace }}"
+ mkdir -p "${{ github.workspace }}"
+
+ - name: Checkout TinyUSB
+ uses: actions/checkout@v4
+
+ - name: Get Dependencies
+ run: python3 tools/get_deps.py $BUILD_ARGS
+
+ - name: Build
+ run: python3 tools/build.py --one-per-family --toolchain iar $BUILD_ARGS
+
+ - name: Test on actual hardware (hardware in the loop)
+ if: github.event_name == 'pull_request'
+ run: |
+ python3 test/hil/hil_test.py hfp.json
diff --git a/.github/workflows/build_iar.yml b/.github/workflows/build_iar.yml
deleted file mode 100644
index c8a095c18..000000000
--- a/.github/workflows/build_iar.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Build IAR
-
-on:
- workflow_dispatch:
- pull_request:
- branches: [ master ]
- paths:
- - 'src/**'
- - 'examples/**'
- - 'lib/**'
- - 'hw/**'
- - 'tools/get_deps.py'
- - 'test/hil/**'
- - '.github/workflows/build_iar.yml'
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
-jobs:
- cmake:
- if: github.repository_owner == 'hathach'
- runs-on: [self-hosted, Linux, X64, hifiphile]
- strategy:
- fail-fast: false
- matrix:
- family:
- # Alphabetical order
- # Note: bundle multiple families into a matrix since there is only one self-hosted instance can
- # run IAR build. Too many matrix can hurt due to setup/teardown overhead.
- - 'lpc43 stm32f0 stm32f1 stm32f7 stm32g0 stm32g4 stm32l4'
- steps:
- - name: Clean workspace
- run: |
- echo "Cleaning up previous run"
- rm -rf "${{ github.workspace }}"
- mkdir -p "${{ github.workspace }}"
-
- - name: Checkout TinyUSB
- uses: actions/checkout@v4
-
- - name: Get Dependencies
- run: python3 tools/get_deps.py ${{ matrix.family }}
-
- - name: Build
- run: python3 tools/build.py --toolchain iar ${{ matrix.family }}
-
- - name: Test on actual hardware (hardware in the loop)
- run: |
- python3 test/hil/hil_test.py hfp.json
diff --git a/.github/workflows/build_renesas.yml b/.github/workflows/build_renesas.yml
index 1be49344f..3d2cbab28 100644
--- a/.github/workflows/build_renesas.yml
+++ b/.github/workflows/build_renesas.yml
@@ -34,11 +34,6 @@ jobs:
# Alphabetical order
- 'rx'
steps:
- - name: Setup Python
- uses: actions/setup-python@v5
- with:
- python-version: '3.x'
-
- name: Checkout TinyUSB
uses: actions/checkout@v4
diff --git a/.github/workflows/build_util.yml b/.github/workflows/build_util.yml
index f8ad1900c..49a9feabd 100644
--- a/.github/workflows/build_util.yml
+++ b/.github/workflows/build_util.yml
@@ -15,6 +15,10 @@ on:
build-args:
required: true
type: string
+ one-per-family:
+ required: false
+ default: false
+ type: boolean
os:
required: false
type: string
@@ -31,11 +35,6 @@ jobs:
- name: Checkout TinyUSB
uses: actions/checkout@v4
- - name: Setup Python
- uses: actions/setup-python@v5
- with:
- python-version: '3.x'
-
- name: Setup Toolchain
id: setup-toolchain
uses: ./.github/actions/setup_toolchain
@@ -48,10 +47,20 @@ jobs:
with:
arg: ${{ matrix.arg }}
+ - name: Set build one-per-family option
+ id: set-one-per-family
+ run: |
+ if [[ "${{ inputs.one-per-family }}" == "true" ]]; then
+ BUILD_OPTION="--one-per-family"
+ fi
+ echo "build_option=$BUILD_OPTION"
+ echo "build_option=$BUILD_OPTION" >> $GITHUB_OUTPUT
+ shell: bash
+
- name: Build
if: inputs.toolchain != 'esp-idf'
run: |
- python tools/build.py -s ${{ inputs.build-system }} ${{ steps.setup-toolchain.outputs.build_option }} ${{ matrix.arg }}
+ python tools/build.py -s ${{ inputs.build-system }} ${{ steps.setup-toolchain.outputs.build_option }} ${{ steps.set-one-per-family.outputs.build_option }} ${{ matrix.arg }}
- name: Build using ESP-IDF docker
if: inputs.toolchain == 'esp-idf'
diff --git a/.github/workflows/ci_set_matrix.py b/.github/workflows/ci_set_matrix.py
index ea758d917..62239c9ad 100644
--- a/.github/workflows/ci_set_matrix.py
+++ b/.github/workflows/ci_set_matrix.py
@@ -4,6 +4,7 @@ import json
toolchain_list = {
"aarch64-gcc": "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz",
"arm-clang": "https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-17.0.1/LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64.tar.xz",
+ "arm-iar": "",
"arm-gcc": "",
"msp430-gcc": "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/9_2_0_0/export/msp430-gcc-9.2.0.50_linux64.tar.bz2",
"riscv-gcc": "https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v10.1.0-1.1/xpack-riscv-none-embed-gcc-10.1.0-1.1-linux-x64.tar.gz",
@@ -28,12 +29,12 @@ family_list = {
"rp2040": ["arm-gcc"],
"samd11 samd21 saml2x": ["arm-gcc", "arm-clang"],
"samd5x_e5x samg": ["arm-gcc", "arm-clang"],
- "stm32f0 stm32f1 stm32f2 stm32f3": ["arm-gcc", "arm-clang"],
- "stm32f4": ["arm-gcc", "arm-clang"],
- "stm32f7": ["arm-gcc", "arm-clang"],
- "stm32g0 stm32g4 stm32h5": ["arm-gcc", "arm-clang"],
- "stm32h7": ["arm-gcc", "arm-clang"],
- "stm32l4 stm32u5 stm32wb": ["arm-gcc", "arm-clang"],
+ "stm32f0 stm32f1 stm32f2 stm32f3": ["arm-gcc", "arm-clang", "arm-iar"],
+ "stm32f4": ["arm-gcc", "arm-clang", "arm-iar"],
+ "stm32f7": ["arm-gcc", "arm-clang", "arm-iar"],
+ "stm32g0 stm32g4 stm32h5": ["arm-gcc", "arm-clang", "arm-iar"],
+ "stm32h7": ["arm-gcc", "arm-clang", "arm-iar"],
+ "stm32l4 stm32u5 stm32wb": ["arm-gcc", "arm-clang", "arm-iar"],
"xmc4000": ["arm-gcc"],
}
@@ -43,7 +44,16 @@ def set_matrix_json():
for toolchain in toolchain_list.keys():
filtered_families = [family for family, supported_toolchain in family_list.items() if
toolchain in supported_toolchain]
+
+ # always add board in hfp.json for arm-iar
+ if toolchain == 'arm-iar':
+ with open('test/hil/hfp.json') as f:
+ hfp_data = json.load(f)
+ hfp_boards = [f"-b{board['name']}" for board in hfp_data['boards']]
+ filtered_families = filtered_families + hfp_boards
+
matrix[toolchain] = {"family": filtered_families, "toolchain_url": toolchain_list[toolchain]}
+
print(json.dumps(matrix))
diff --git a/.github/workflows/hil_test.yml b/.github/workflows/hil_test.yml
index eb3f2cbab..adb5bf00e 100644
--- a/.github/workflows/hil_test.yml
+++ b/.github/workflows/hil_test.yml
@@ -30,11 +30,6 @@ jobs:
- name: Checkout TinyUSB
uses: actions/checkout@v4
- - name: Setup Python
- uses: actions/setup-python@v5
- with:
- python-version: '3.x'
-
- name: Parse HIL json
id: parse_hil_json
run: |
@@ -78,11 +73,6 @@ jobs:
- name: Checkout TinyUSB
uses: actions/checkout@v4
- - name: Setup Python
- uses: actions/setup-python@v5
- with:
- python-version: '3.x'
-
- name: Parse HIL json
id: parse_hil_json
run: |
@@ -131,7 +121,7 @@ jobs:
- build-esp
runs-on: [self-hosted, rp2040, nrf52840, esp32s3, hardware-in-the-loop]
env:
- BOARDS_LIST: "${{ needs.build.outputs.BOARDS_LIST }} ${{ needs.build-esp.outputs.BOARDS_LIST }}"
+ BOARDS_LIST: "${{ needs.build.outputs.BOARDS_LIST }} ${{ needs.build-esp.outputs.BOARDS_LIST }}"
steps:
- name: Clean workspace
run: |
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index d1ffe6ca1..379a22ee2 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -14,11 +14,6 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- - name: Setup Python
- uses: actions/setup-python@v5
- with:
- python-version: '3.x'
-
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with: