Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arch: x86_64, Board: x86_64 #95

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Arch: x86_64, Board: x86_64 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc531e7
Change apache/nuttx to lupyuen5/label-nuttx. Enable macOS Builds. Bui…
lupyuen Nov 21, 2024
20f3591
CI: Build `other` for Simple x86 PR
lupyuen Nov 21, 2024
4c913cb
Arch: x86_64, Board: x86_64
lupyuen Nov 21, 2024
958a96b
Create test.txt
lupyuen Nov 21, 2024
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
23 changes: 18 additions & 5 deletions .github/workflows/arch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ jobs:
echo 'arch_contains_sim=1' | tee -a $GITHUB_OUTPUT
elif [[ "$labels" == *"Arch: x86_64"* ]]; then
echo 'arch_contains_x86_64=1' | tee -a $GITHUB_OUTPUT
elif [[ "$labels" == *"Arch: x86"* ]]; then
echo 'arch_contains_x86=1' | tee -a $GITHUB_OUTPUT
elif [[ "$labels" == *"Arch: xtensa"* ]]; then
echo 'arch_contains_xtensa=1' | tee -a $GITHUB_OUTPUT
fi
Expand All @@ -91,6 +93,8 @@ jobs:
echo 'board_contains_sim=1' | tee -a $GITHUB_OUTPUT
elif [[ "$labels" == *"Board: x86_64"* ]]; then
echo 'board_contains_x86_64=1' | tee -a $GITHUB_OUTPUT
elif [[ "$labels" == *"Board: x86"* ]]; then
echo 'board_contains_x86=1' | tee -a $GITHUB_OUTPUT
elif [[ "$labels" == *"Board: xtensa"* ]]; then
echo 'board_contains_xtensa=1' | tee -a $GITHUB_OUTPUT
fi
Expand All @@ -104,11 +108,11 @@ jobs:
run: |

# Skip all macOS Builds
if [[ "${{ inputs.os }}" == "macOS" ]]; then
echo "Skipping all macOS Builds"
echo "skip_all_builds=1" | tee -a $GITHUB_OUTPUT
exit
fi
#### if [[ "${{ inputs.os }}" == "macOS" ]]; then
#### echo "Skipping all macOS Builds"
#### echo "skip_all_builds=1" | tee -a $GITHUB_OUTPUT
#### exit
#### fi

# Fetch the outputs from the previous step
numlabels=${{ steps.get-arch.outputs.numlabels }}
Expand All @@ -119,12 +123,14 @@ jobs:
arch_contains_arm64=${{ steps.get-arch.outputs.arch_contains_arm64 }}
arch_contains_riscv=${{ steps.get-arch.outputs.arch_contains_riscv }}
arch_contains_sim=${{ steps.get-arch.outputs.arch_contains_sim }}
arch_contains_x86=${{ steps.get-arch.outputs.arch_contains_x86 }}
arch_contains_x86_64=${{ steps.get-arch.outputs.arch_contains_x86_64 }}
arch_contains_xtensa=${{ steps.get-arch.outputs.arch_contains_xtensa }}
board_contains_arm=${{ steps.get-arch.outputs.board_contains_arm }}
board_contains_arm64=${{ steps.get-arch.outputs.board_contains_arm64 }}
board_contains_riscv=${{ steps.get-arch.outputs.board_contains_riscv }}
board_contains_sim=${{ steps.get-arch.outputs.board_contains_sim }}
board_contains_x86=${{ steps.get-arch.outputs.board_contains_x86 }}
board_contains_x86_64=${{ steps.get-arch.outputs.board_contains_x86_64 }}
board_contains_xtensa=${{ steps.get-arch.outputs.board_contains_xtensa }}

Expand All @@ -151,6 +157,7 @@ jobs:
"$arch_contains_arm64" != "$board_contains_arm64" ||
"$arch_contains_riscv" != "$board_contains_riscv" ||
"$arch_contains_sim" != "$board_contains_sim" ||
"$arch_contains_x86" != "$board_contains_x86" ||
"$arch_contains_x86_64" != "$board_contains_x86_64" ||
"$arch_contains_xtensa" != "$board_contains_xtensa"
]]; then
Expand Down Expand Up @@ -218,6 +225,12 @@ jobs:
skip_build=1
fi

# For "Arch / Board: x86": Build other
elif [[ "$arch_contains_x86" == "1" || "$board_contains_x86" == "1" ]]; then
if [[ "$board" != *"other"* ]]; then
skip_build=1
fi

# For "Arch / Board: x86_64": Build x86_64-01
elif [[ "$arch_contains_x86_64" == "1" || "$board_contains_x86_64" == "1" ]]; then
if [[ "$board" != *"x86_64-"* ]]; then
Expand Down
30 changes: 19 additions & 11 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ on:
push:
paths-ignore:
- 'Documentation/**'
branches:
- 'releases/*'
tags:
#### branches:
#### - 'releases/*'
#### tags:

permissions:
contents: read
Expand Down Expand Up @@ -68,7 +68,8 @@ jobs:
# Determine the repo and leave that unset to use the normal checkout behavior
# of using the merge commit instead of HEAD
case $GITHUB_REPOSITORY in
"apache/nuttx")
#### "apache/nuttx")
"lupyuen5/label-nuttx") ####
# OS
echo "Triggered by change in OS"
APPS_REF=$REF_NAME
Expand All @@ -92,7 +93,8 @@ jobs:
- name: Checkout nuttx repo
uses: actions/checkout@v4
with:
repository: apache/nuttx
#### repository: apache/nuttx
repository: lupyuen5/label-nuttx ####
ref: ${{ steps.gittargets.outputs.os_ref }}
path: sources/nuttx
fetch-depth: 1
Expand All @@ -118,7 +120,8 @@ jobs:

# Select the Linux Builds based on PR Arch Label
Linux-Arch:
uses: apache/nuttx/.github/workflows/arch.yml@master
#### uses: apache/nuttx/.github/workflows/arch.yml@master
uses: lupyuen5/label-nuttx/.github/workflows/arch.yml@master ####
needs: Fetch-Source
with:
os: Linux
Expand All @@ -142,7 +145,8 @@ jobs:
DOCKER_BUILDKIT: 1

strategy:
max-parallel: 12
#### max-parallel: 12
fail-fast: false ####
matrix:
boards: ${{ fromJSON(needs.Linux-Arch.outputs.selected_builds) }}

Expand Down Expand Up @@ -197,7 +201,8 @@ jobs:

# Select the macOS Builds based on PR Arch Label
macOS-Arch:
uses: apache/nuttx/.github/workflows/arch.yml@master
#### uses: apache/nuttx/.github/workflows/arch.yml@master
uses: lupyuen5/label-nuttx/.github/workflows/arch.yml@master ####
needs: Fetch-Source
with:
os: macOS
Expand All @@ -212,7 +217,8 @@ jobs:
needs: macOS-Arch
if: ${{ needs.macOS-Arch.outputs.skip_all_builds != '1' }}
strategy:
max-parallel: 2
#### max-parallel: 2
fail-fast: false ####
matrix:
boards: ${{ fromJSON(needs.macOS-Arch.outputs.selected_builds) }}
steps:
Expand Down Expand Up @@ -257,7 +263,8 @@ jobs:

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

# Select the msvc Builds based on PR Arch Label
msvc-Arch:
uses: apache/nuttx/.github/workflows/arch.yml@master
#### uses: apache/nuttx/.github/workflows/arch.yml@master
uses: lupyuen5/label-nuttx/.github/workflows/arch.yml@master ####
needs: Fetch-Source
with:
os: msvc
Expand Down
1 change: 1 addition & 0 deletions arch/x86_64/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions boards/x86_64/intel64/qemu-intel64/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Loading