diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml index 7367eb9a79544..5c0a2d8cd0088 100644 --- a/.github/workflows/arch.yml +++ b/.github/workflows/arch.yml @@ -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 @@ -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 @@ -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 }} @@ -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 }} @@ -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 @@ -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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bae1382c1a6c..4999552747328 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,9 +20,9 @@ on: push: paths-ignore: - 'Documentation/**' - branches: - - 'releases/*' - tags: + #### branches: + #### - 'releases/*' + #### tags: permissions: contents: read @@ -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 @@ -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 @@ -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 @@ -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) }} @@ -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 @@ -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: @@ -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 @@ -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 diff --git a/arch/x86/test.txt b/arch/x86/test.txt new file mode 100644 index 0000000000000..8b137891791fe --- /dev/null +++ b/arch/x86/test.txt @@ -0,0 +1 @@ +