From adad56d959c0899b894aaea0cdb6043cfa62f5ba Mon Sep 17 00:00:00 2001
From: zykrahgaming <zykrahgaming@gmail.com>
Date: Sat, 1 Jan 2022 17:21:00 +1100
Subject: [PATCH] Reversed extra chibios build files for pico, now all MCUs are
 using master branch of Chibios

---
 .github/workflows/build.yml | 26 +++------------
 tools/chbuild-pico.sh       | 65 -------------------------------------
 2 files changed, 5 insertions(+), 86 deletions(-)
 delete mode 100755 tools/chbuild-pico.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5a5ec47a..1b5b0fa8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,9 +2,9 @@ name: build tests
 
 on:
   push:
-    branches: [ chibios-21.6.x ]
+    branches: [ chibios-21.11.x-dev ]
   pull_request:
-    branches: [ chibios-21.6.x ]
+    branches: [ chibios-21.11.x-dev ]
 
 jobs:
   build:
@@ -16,7 +16,7 @@ jobs:
         release: '10-2020-q4'
     - name: setup vars
       run: |
-        echo "CH_VER=stable_20.3.x" >> $GITHUB_ENV
+        echo "CH_VER=master" >> $GITHUB_ENV
         echo "CHC_PATH=$GITHUB_WORKSPACE" >> $GITHUB_ENV
     - name: download Chibios
       run: |
@@ -30,22 +30,6 @@ jobs:
       run: |
         cd $CHC_PATH/ext
         for i in *.7z; do 7z x -y $i; done
-    - name: setup vars (for Pico)
-      run: |
-        echo "CH_P_VER=master" >> $GITHUB_ENV
-        echo "CHC_P_PATH=$GITHUB_WORKSPACE" >> $GITHUB_ENV
-    - name: download Chibios (for Pico)
-      run: |
-        curl -L https://github.com/ChibiOS/ChibiOS/archive/$CH_P_VER.tar.gz | tar xz
-        echo "CH_P_PATH=$GITHUB_WORKSPACE/ChibiOS-$CH_P_VER" >> $GITHUB_ENV
-    - name: decompress ChibiOS ext resources (for Pico)
-      run: |
-        cd $CH_P_PATH/ext
-        for i in *.7z; do 7z x -y "$i"; done
-    - name: decompress ChibiOS-Contrib ext resources (for Pico)
-      run: |
-        cd $CHC_P_PATH/ext
-        for i in *.7z; do 7z x -y "$i"; done
     - name: build STM32
       run: |
         $CHC_PATH/tools/chbuild.sh $CHC_PATH/testhal/STM32
@@ -76,5 +60,5 @@ jobs:
         $CHC_PATH/tools/chbuild.sh $CHC_PATH/demos/NUMICRO
     - name: build RP
       run: |
-        $CHC_P_PATH/tools/chbuild-pico.sh $CHC_P_PATH/testhal/RP
-        $CHC_P_PATH/tools/chbuild-pico.sh $CHC_P_PATH/demos/RP
+        $CHC_PATH/tools/chbuild.sh $CHC_P_PATH/testhal/RP
+        $CHC_PATH/tools/chbuild.sh $CHC_P_PATH/demos/RP
diff --git a/tools/chbuild-pico.sh b/tools/chbuild-pico.sh
deleted file mode 100755
index 670aaea5..00000000
--- a/tools/chbuild-pico.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-#
-# Author: Fabien Poussin
-# Date: 21/04/2017
-# Version: 1.0
-#
-
-renice +10 $$
-JOBS=$(nproc)
-SKIP_ARRAY=(Win32)
-RETCODE=0
-
-function chbuild {
-  projects=$(find $1 -name Makefile -printf '%h ')
-  OK=0
-  NOK=0
-  FAIL=()
-  SUCCESS=()
-  SKIPPED=()
-  for t in $projects
-  do
-    if [[ -f "${t}/.skip" ]]; then
-      printf "SKIPPING: ${t}\n"
-      SKIPPED+=($t)
-      continue
-    fi
-    pushd $t > /dev/null
-    if [[ ! -z ${CH_CLEAN+x} ]]; then
-        printf "CLEANING: ${t}\n"
-        make clean
-    fi
-    printf "BUILDING: ${t}\n"
-    if [[ -z "${CH_P_PATH+x}" || -z "${CHC_P_PATH+x}" ]]; then
-        make --quiet -j $JOBS > /dev/null
-    else
-        make CHIBIOS=$CH_P_PATH CHIBIOS_CONTRIB=$CHC_P_PATH --quiet -j $JOBS > /dev/null
-    fi
-    if [ $? -ne 0 ]; then
-      ((NOK++))
-      FAIL+=($t)
-      RETCODE=1
-    else
-      ((OK++))
-      SUCCESS+=($t)
-    fi
-    popd > /dev/null
-  done
-  printf "\n${1}: ${OK} builds ok, ${NOK} builds failed\n"
-  printf 'FAIL: %s\n' "${FAIL[@]}"
-  printf 'SKIPPED: %s\n' "${SKIPPED[@]}"
-  printf "\n"
-  return $NOK
-}
-
-if [ -z "$1" ]
-  then
-    printf "This script looks for Makefiles and tries to build the projects\n"
-    printf "Usage: chbuild.sh PATH\n"
-    exit 1
-fi
-
-chbuild $1
-
-exit $RETCODE