Merge branch 'master' into master

Author: RefactorFactory

.github/ISSUE_TEMPLATE/Issue-report.yml

@@ -41,6 +41,8 @@ body:
  options:
  - latest master (checkout manually)
  - latest development Release Candidate (RC-X)
+ - v2.0.9
+ - v2.0.8
  - v2.0.7
  - v2.0.6
  - v2.0.5 

.github/scripts/find_all_boards.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Get all boards
+boards_array=()
+
+for line in `grep '.tarch=' boards.txt`; do
+ board_name=$(echo "$line" | cut -d '.' -f1 | cut -d '#' -f1)
+ boards_array+=("espressif:esp32:$board_name")
+ echo "Added 'espressif:esp32:$board_name' to array"
+done
+
+# Create JSON like string with all boards found and pass it to env variable
+board_count=${#boards_array[@]}
+echo "Boards found: $board_count"
+echo "BOARD-COUNT=$board_count" >> $GITHUB_ENV
+
+if [ $board_count -gt 0 ]
+then
+ json_matrix='['
+ for board in ${boards_array[@]}
+ do
+ json_matrix+='"'$board'"'
+ if [ $board_count -gt 1 ]
+ then
+ json_matrix+=","
+ fi
+ board_count=$(($board_count - 1))
+ done
+ json_matrix+=']'
+
+ echo $json_matrix
+ echo "FQBNS=${json_matrix}" >> $GITHUB_ENV
+else
+ echo "FQBNS=" >> $GITHUB_ENV
+fi

.github/scripts/find_new_boards.sh

@@ -0,0 +1,90 @@
+#!/bin/bash
+
+# Get inputs from command
+owner_repository=$1
+pr_number=$2
+
+url="https://api.github.com/repos/$owner_repository/pulls/$pr_number/files"
+echo $url
+
+# Get changes in boards.txt file from PR
+Patch=$(curl $url | jq -r '.[] | select(.filename == "boards.txt") | .patch ')
+
+# Extract only changed lines number and count
+substring_patch=$(echo "$Patch" | grep -o '@@[^@]*@@')
+
+params_array=()
+
+IFS=$'\n' read -d '' -ra params <<< $(echo "$substring_patch" | grep -oE '[-+][0-9]+,[0-9]+')
+
+for param in "${params[@]}"
+do
+ echo "The parameter is $param"
+ params_array+=("$param")
+done
+
+boards_array=()
+previous_board=""
+file="boards.txt"
+
+# Loop through boards.txt file and extract all boards that were added
+for (( c=0; c<${#params_array[@]}; c+=2 ))
+do
+ deletion_count=$( echo "${params_array[c]}" | cut -d',' -f2 | cut -d' ' -f1 )
+ addition_line=$( echo "${params_array[c+1]}" | cut -d'+' -f2 | cut -d',' -f1 )
+ addition_count=$( echo "${params_array[c+1]}" | cut -d'+' -f2 | cut -d',' -f2 | cut -d' ' -f1 )
+ addition_end=$(($addition_line+$addition_count))
+ 
+ addition_line=$(($addition_line + 3))
+ addition_end=$(($addition_end - $deletion_count))
+
+ echo $addition_line
+ echo $addition_end
+
+ i=0
+
+ while read -r line
+ do
+ i=$((i+1))
+ if [ $i -lt $addition_line ]
+ then
+ continue
+ elif [ $i -gt $addition_end ]
+ then
+ break
+ fi
+ board_name=$(echo "$line" | cut -d '.' -f1 | cut -d '#' -f1)
+ if [ "$board_name" != "" ]
+ then
+ if [ "$board_name" != "$previous_board" ]
+ then
+ boards_array+=("espressif:esp32:$board_name")
+ previous_board="$board_name"
+ echo "Added 'espressif:esp32:$board_name' to array"
+ fi
+ fi
+ done < "$file"
+done
+
+# Create JSON like string with all boards found and pass it to env variable
+board_count=${#boards_array[@]}
+
+if [ $board_count -gt 0 ]
+then
+ json_matrix='{"fqbn": ['
+ for board in ${boards_array[@]}
+ do
+ json_matrix+='"'$board'"'
+ if [ $board_count -gt 1 ]
+ then
+ json_matrix+=","
+ fi
+ board_count=$(($board_count - 1))
+ done
+ json_matrix+=']}'
+
+ echo $json_matrix
+ echo "FQBNS=${json_matrix}" >> $GITHUB_ENV
+else
+ echo "FQBNS=" >> $GITHUB_ENV
+fi

.github/scripts/sketch_utils.sh

@@ -117,26 +117,27 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
  # 3. Created at the sketch level as "buildX" where X is the number
  # of configuration built in case of a multiconfiguration test.
 
+ sketchname=$(basename $sketchdir)
+ 
  ARDUINO_CACHE_DIR="$HOME/.arduino/cache.tmp"
  if [ -n "$ARDUINO_BUILD_DIR" ]; then
  build_dir="$ARDUINO_BUILD_DIR"
  elif [ $len -eq 1 ]; then
  # build_dir="$sketchdir/build"
- build_dir="$HOME/.arduino/build.tmp"
+ build_dir="$HOME/.arduino/tests/$sketchname/build.tmp"
  fi
 
  mkdir -p "$ARDUINO_CACHE_DIR"
  for i in `seq 0 $(($len - 1))`
  do
  if [ $len -ne 1 ]; then
  # build_dir="$sketchdir/build$i"
- build_dir="$HOME/.arduino/build$i.tmp"
+ build_dir="$HOME/.arduino/tests/$sketchname/build$i.tmp"
  fi
  rm -rf $build_dir
  mkdir -p $build_dir
 
  currfqbn=`echo $fqbn | jq -r --argjson i $i '.[$i]'`
- sketchname=$(basename $sketchdir)
 
  if [ -f "$ide_path/arduino-cli" ]; then
  echo "Building $sketchname with arduino-cli and FQBN=$currfqbn"
@@ -152,6 +153,7 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
  $xtra_opts "${sketchdir}"
  elif [ -f "$ide_path/arduino-builder" ]; then
  echo "Building $sketchname with arduino-builder and FQBN=$currfqbn"
+ echo "Build path = $build_dir"
 
  $ide_path/arduino-builder -compile -logger=human -core-api-version=10810 \
  -fqbn=\"$currfqbn\" \

.github/scripts/tests_run.sh

@@ -15,7 +15,8 @@ function run_test() {
  fi
 
  if [ $len -eq 1 ]; then
- build_dir="tests/$sketchname/build"
+ # build_dir="tests/$sketchname/build"
+ build_dir="$HOME/.arduino/tests/$sketchname/build.tmp"
  report_file="tests/$sketchname/$sketchname.xml"
  fi
 
@@ -27,7 +28,8 @@ function run_test() {
  fi
 
  if [ $len -ne 1 ]; then
- build_dir="tests/$sketchname/build$i"
+ # build_dir="tests/$sketchname/build$i"
+ build_dir="$HOME/.arduino/tests/$sketchname/build$i.tmp"
  report_file="tests/$sketchname/$sketchname$i.xml"
  fi
 

.github/workflows/allboards.yml

@@ -0,0 +1,86 @@
+name: Boards Test - Remote trigger
+
+# The workflow will run on remote dispath with event-type set to "test-boards"
+on:
+ repository_dispatch:
+ types: [test-boards]
+
+jobs:
+ find-boards:
+ runs-on: ubuntu-latest
+
+ outputs:
+ fqbns: ${{ env.FQBNS }}
+ board-count: ${{ env.BOARD-COUNT }}
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+ with:
+ ref: ${{ github.event.client_payload.branch }}
+
+ - name: Get boards fqbns
+ run: 
+ bash .github/scripts/find_all_boards.sh
+
+ setup-chunks:
+ needs: find-boards
+ runs-on: ubuntu-latest
+ if: needs.find-boards.outputs.fqbns != ''
+
+ outputs:
+ test-chunks: ${{ steps['set-test-chunks'].outputs['test-chunks'] }}
+
+ steps:
+ - uses: actions/checkout@v3
+ - run: npm install
+ - name: Setup jq
+ uses: dcarbone/install-jq-action@v1.0.1
+
+ - id: set-test-chunks
+ name: Set Chunks
+ run: 
+ echo "test-chunks<<EOF" >> $GITHUB_OUTPUT
+
+ echo "$( jq -nc '${{ needs.find-boards.outputs.fqbns }} | [_nwise( ${{ needs.find-boards.outputs.board-count }}/15 | ceil)]')" >> $GITHUB_OUTPUT
+
+ echo "EOF" >> $GITHUB_OUTPUT
+
+ test-boards:
+ needs: setup-chunks
+ runs-on: ubuntu-latest
+
+ env:
+ REPOSITORY: |
+ - source-path: '.'
+ name: "espressif:esp32"
+
+ strategy:
+ fail-fast: false
+ matrix: 
+ chunk: ${{ fromJSON(needs.setup-chunks.outputs['test-chunks']) }}
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ - name: Echo FQBNS to file
+ run:
+ echo "$FQBN" > fqbns.json
+ env: 
+ FQBN: ${{ toJSON(matrix.chunk) }}
+
+ - name: Compile sketch
+ uses: P-R-O-C-H-Y/compile-sketches@main
+ with:
+ platforms: |
+ ${{ env.REPOSITORY }}
+ multiple-fqbn: true
+ multiple-fqbn-path: "fqbns.json"
+ use-json-file: false
+ enable-deltas-report: false
+ enable-warnings-report: false
+ cli-compile-flags: |
+ - --warnings="all"
+ sketch-paths:
+ "- ./libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino"

.github/workflows/boards.yml

@@ -0,0 +1,61 @@
+name: Boards Test
+
+# The workflow will run on schedule and labeled pull requests
+on:
+ pull_request:
+
+env:
+ # It's convenient to set variables for values used multiple times in the workflow
+ GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+jobs:
+ find-boards:
+ runs-on: ubuntu-latest
+
+ outputs:
+ fqbns: ${{ env.FQBNS }}
+
+ steps:
+ # This step makes the contents of the repository available to the workflow
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ - name: Setup jq
+ uses: dcarbone/install-jq-action@v1.0.1
+
+ - name: Get board name
+ run: 
+ bash .github/scripts/find_new_boards.sh ${{ github.repository }} ${{github.event.number}}
+
+ test-boards:
+ needs: find-boards
+ runs-on: ubuntu-latest
+ if: needs.find-boards.outputs.fqbns != ''
+
+ env:
+ REPOSITORY: |
+ - source-path: '.'
+ name: "espressif:esp32"
+
+ strategy:
+ matrix: ${{ fromJson(needs.find-boards.outputs.fqbns) }}
+
+ steps:
+ # This step makes the contents of the repository available to the workflow
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ - name: Compile sketch
+ uses: P-R-O-C-H-Y/compile-sketches@main
+ with:
+ platforms: |
+ ${{ env.REPOSITORY }}
+ fqbn: ${{ matrix.fqbn }}
+ use-json-file: false
+ enable-deltas-report: false
+ enable-warnings-report: false
+ cli-compile-flags: |
+ - --warnings="all"
+ exit-on-fail: true
+ sketch-paths:
+ "- ./libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino"