Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/arch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:
required: true
type: string
boards:
description: "List of All Builds: [arm-01, risc-v-01, xtensa-01, ...]"
description: "List of All Builds: [arm-imx, risc-v-01, xtensa-01, ...]"
required: true
type: string
outputs:
skip_all_builds:
description: "Set to 1 if all builds should be skipped"
value: ${{ jobs.Select-Builds.outputs.skip_all_builds }}
selected_builds:
description: "Selected Builds for the PR: [arm-01, risc-v-01, xtensa-01, ...]"
description: "Selected Builds for the PR: [arm-imx, risc-v-01, xtensa-01, ...]"
value: ${{ jobs.Select-Builds.outputs.selected_builds }}

jobs:
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# Select the Builds for the PR: arm-01, risc-v-01, xtensa-01, ...
# Select the Builds for the PR: arm-imx, risc-v-01, xtensa-01, ...
- name: Select builds
id: select-builds
run: |
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
board_contains_x86_64=${{ steps.get-arch.outputs.board_contains_x86_64 }}
board_contains_xtensa=${{ steps.get-arch.outputs.board_contains_xtensa }}

# inputs.boards is a JSON Array: ["arm-01", "risc-v-01", "xtensa-01", ...]
# inputs.boards is a JSON Array: ["arm-imx", "risc-v-01", "xtensa-01", ...]
# We compact and remove the newlines
boards=$( echo '${{ inputs.boards }}' | jq --compact-output ".")
numboards=$( echo "$boards" | jq "length" )
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
board=$( echo "$boards" | jq ".[$i]" )
skip_build=0

# For "Arch / Board: arm": Build arm-01, arm-02, ...
# For "Arch / Board: arm": Build arm-*
if [[ "$arch_contains_arm" == "1" || "$board_contains_arm" == "1" ]]; then
if [[ "$board" != *"arm-"* ]]; then
skip_build=1
Expand Down
23 changes: 12 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -296,19 +296,20 @@ jobs:

# Select the Linux Builds based on PR Arch Label
Linux-Arch:
uses: apache/nuttx-apps/.github/workflows/arch.yml@master
uses: ./.github/workflows/arch.yml
needs: Fetch-Source
with:
os: Linux
boards: |
[
"arm-01", "risc-v-01", "sim-01", "xtensa-01", "arm64-01", "x86_64-01", "other",
"arm-02", "risc-v-02", "sim-02", "xtensa-02",
"arm-03", "risc-v-03", "sim-03", "xtensa-03",
"arm-04", "risc-v-04",
"arm-05", "risc-v-05",
"arm-06", "risc-v-06",
"arm-07", "arm-08", "arm-09", "arm-10", "arm-11", "arm-12", "arm-13", "arm-14"
"arm-imx", "risc-v-01", "sim-01", "xtensa-01", "arm64-01", "x86_64-01", "other",
"arm-nrf", "risc-v-02", "sim-02", "xtensa-02",
"arm-nxp", "risc-v-03", "sim-03", "xtensa-03",
"arm-rp2xxx", "risc-v-04",
"arm-sam", "risc-v-05",
"arm-ti", "risc-v-06",
"arm-stm32f4-1", "arm-stm32f4-2", "arm-stm32f0-f3", "arm-stm32h7",
"arm-stm32l-u-g", "arm-stm32-other", "arm-other"
]

# Run the selected Linux Builds
Expand Down Expand Up @@ -470,7 +471,7 @@ jobs:

# Select the macOS Builds based on PR Arch Label
macOS-Arch:
uses: apache/nuttx-apps/.github/workflows/arch.yml@master
uses: ./.github/workflows/arch.yml
needs: Fetch-Source
with:
os: macOS
Expand Down Expand Up @@ -533,7 +534,7 @@ jobs:

# Select the msys2 Builds based on PR Arch Label
msys2-Arch:
uses: apache/nuttx-apps/.github/workflows/arch.yml@master
uses: ./.github/workflows/arch.yml
needs: Fetch-Source
with:
os: msys2
Expand Down Expand Up @@ -617,7 +618,7 @@ jobs:

# Select the msvc Builds based on PR Arch Label
msvc-Arch:
uses: apache/nuttx-apps/.github/workflows/arch.yml@master
uses: ./.github/workflows/arch.yml
needs: Fetch-Source
with:
os: msvc
Expand Down
Loading