build.yml: Modify the build config

Remove unnecessary junk, just build icicle (we don't care about the rest)
tiiuae · Jan 3, 2024 · 8dd907b · 8dd907b
1 parent de8a776
commit 8dd907b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 116 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,37 +1,13 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 name: Build
 
 on:
-  pull_request:
-    paths-ignore:
-      - 'Documentation/**'
-      - 'tools/ci/docker/linux/**'
   push:
-    paths-ignore:
-      - 'Documentation/**'
-    branches:
-      - master
-      - 'releases/*'
-    tags:
+    branches: [master]
+  pull_request:
 
 permissions:
   contents: read
 
-concurrency:
-  group: build-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   Fetch-Source:
     runs-on: ubuntu-latest
@@ -115,16 +91,13 @@ jobs:
           name: source-bundle
           path: sources.tar.gz
 
-  Linux:
-    needs: Fetch-Source
+  Build:
     runs-on: ubuntu-latest
-    env:
-      DOCKER_BUILDKIT: 1
-
+    needs: Fetch-Source
     strategy:
+      fail-fast: false
       matrix:
         boards: [arm-12, risc-v]
-
     steps:
       - name: Download Source Artifact
         uses: actions/download-artifact@v3
@@ -135,88 +108,11 @@ jobs:
       - name: Extract sources
         run: tar zxf sources.tar.gz
 
-      - name: Docker Login
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Docker Pull
-        run: docker pull ghcr.io/apache/nuttx/apache-nuttx-ci-linux
-
-      - name: Export NuttX Repo SHA
-        run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
-
+      # cibuild.sh -i installs the tools for us
       - name: Run builds
-        uses: ./sources/nuttx/.github/actions/ci-container
-        env:
-          BLOBDIR: /tools/blobs
-        with:
-          run: |
-            echo "::add-matcher::sources/nuttx/.github/gcc.json"
-            export ARTIFACTDIR=`pwd`/buildartifacts
-            git config --global --add safe.directory /github/workspace/sources/nuttx
-            git config --global --add safe.directory /github/workspace/sources/apps
-            cd sources/nuttx/tools/ci
-            if [ "X${{matrix.boards}}" = "Xcodechecker" ]; then
-                ./cibuild.sh -c -A -R --codechecker testlist/${{matrix.boards}}.dat
-            else
-                ./cibuild.sh -c -A -R testlist/${{matrix.boards}}.dat
-            fi
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: linux-builds
-          path: buildartifacts/
-        continue-on-error: true
-
-  macOS:
-    if: ${{ false }}  # disable for now
-    permissions:
-      contents: none
-    runs-on: macos-13
-    needs: Fetch-Source
-    strategy:
-      matrix:
-        boards: [macos, sim-01, sim-02]
-    steps:
-      - name: Download Source Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: source-bundle
-          path: .
-
-      - name: Extract sources
-        run: tar zxf sources.tar.gz
-
-      - name: Restore Tools Cache
-        id: cache-tools
-        uses: actions/cache@v3
-        env:
-          cache-name: ${{ runner.os }}-cache-tools
-        with:
-          path: ./sources/tools
-          key: ${{ runner.os }}-tools-${{ hashFiles('./sources/nuttx/tools/ci/cibuild.sh') }}
-
-      - name: Export NuttX Repo SHA
-        run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
-
-      # Released version of Cython has issues with Python 11. Set runner to use Python 3.10
-      # https://github.com/cython/cython/issues/4500
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-      - name: Run Builds
         run: |
           echo "::add-matcher::sources/nuttx/.github/gcc.json"
           export ARTIFACTDIR=`pwd`/buildartifacts
           cd sources/nuttx/tools/ci
           ./cibuild.sh -i -c -A -R testlist/${{matrix.boards}}.dat
 
-      - uses: actions/upload-artifact@v3
-        with:
-          name: macos-builds
-          path: buildartifacts/
-        continue-on-error: true
diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
@@ -116,7 +116,7 @@ function avr-gcc-toolchain {
         brew install avr-gcc
         ;;
       Linux)
-        apt-get install -y avr-libc gcc-avr
+        sudo apt-get install -y avr-libc gcc-avr
         ;;
     esac
   fi
@@ -187,7 +187,7 @@ function clang-tidy {
   if ! type clang-tidy &> /dev/null; then
     case ${os} in
       Linux)
-        apt-get install -y clang clang-tidy
+        sudo apt-get install -y clang clang-tidy
         ;;
     esac
   fi
@@ -215,7 +215,7 @@ function util-linux {
         brew install flock
         ;;
       Linux)
-        apt-get install -y util-linux
+        sudo apt-get install -y util-linux
         ;;
     esac
   fi
@@ -231,7 +231,7 @@ function gen-romfs {
         brew install genromfs
         ;;
       Linux)
-        apt-get install -y genromfs
+        sudo apt-get install -y genromfs
         ;;
     esac
   fi
@@ -467,7 +467,7 @@ function u-boot-tools {
         brew install u-boot-tools
         ;;
       Linux)
-        apt-get install -y u-boot-tools
+        sudo apt-get install -y u-boot-tools
         ;;
     esac
   fi
@@ -588,7 +588,7 @@ case ${os} in
     rm -f /usr/local/bin/openssl || :
     ;;
   Linux)
-    install="arm-clang-toolchain arm-gcc-toolchain arm64-gcc-toolchain avr-gcc-toolchain binutils bloaty clang-tidy gen-romfs gperf kconfig-frontends mips-gcc-toolchain python-tools riscv-gcc-toolchain rust rx-gcc-toolchain sparc-gcc-toolchain xtensa-esp32-gcc-toolchain u-boot-tools util-linux wasi-sdk c-cache"
+    install="arm-gcc-toolchain binutils gen-romfs gperf kconfig-frontends python-tools riscv-gcc-toolchain c-cache"
     ;;
 esac