From 645ed28e5a5be052244e12ef2da6520b97891250 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Fri, 7 Jun 2024 09:26:09 +0200 Subject: [PATCH 1/2] Don't merge, remove Android build --- .github/workflows/Android-CI.yml | 110 ------------------------------- 1 file changed, 110 deletions(-) delete mode 100644 .github/workflows/Android-CI.yml diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml deleted file mode 100644 index c197819d..00000000 --- a/.github/workflows/Android-CI.yml +++ /dev/null @@ -1,110 +0,0 @@ -name: PullRequest - -on: [ pull_request ] - -jobs: - buildTest: - name: Test - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ macOS-13 ] - java_version: [ 17 ] - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install JDK ${{ matrix.java_version }} - uses: actions/setup-java@v4 - with: - distribution: 'adopt' - java-version: ${{ matrix.java_version }} - - uses: gradle/actions/wrapper-validation@v3 - - name: Install Android SDK - uses: hannesa2/action-android/install-sdk@0.1.16.7 - - name: Run tests - run: ./gradlew test - env: - VERSION: ${{ github.ref }} - - name: Run instrumentation tests - uses: hannesa2/action-android/emulator-run-cmd@0.1.16.7 - env: - VERSION: ${{ github.ref }} - with: - cmd: ./gradlew cAT --continue - api: 28 - tag: default - abi: x86 - cmdOptions: -noaudio -no-boot-anim -no-window -metrics-collection - - name: Archive Espresso results - uses: actions/upload-artifact@v4 - if: ${{ always() }} - with: - name: IOIO-Espresso-report - path: applications/**/build/reports/androidTests/connected/ - - name: Archive screenshots - uses: actions/upload-artifact@v4 - if: ${{ always() }} - with: - name: IOIO-Screenshots - path: | - applications/**/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected - applications/**/build/outputs/androidTest-results/connected - - Check: - name: Check - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ ubuntu-latest ] - java_version: [ 17 ] - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install JDK - uses: actions/setup-java@v4 - with: - distribution: 'adopt' - java-version: ${{ matrix.java_version }} - - name: Install Android SDK - uses: hannesa2/action-android/install-sdk@0.1.16.7 - - name: Code checks - run: ./gradlew check - - name: Archive Lint report - uses: actions/upload-artifact@v4 - if: ${{ always() }} - with: - name: IOIO-Lint-report - path: applications/**/build/reports/lint-results.html - - buildRelease: - name: Release - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ macOS-14 ] - java_version: [ 17 ] - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install JDK ${{ matrix.java_version }} - uses: actions/setup-java@v4 - with: - distribution: 'adopt' - java-version: ${{ matrix.java_version }} - - name: build release - run: ./gradlew assembleRelease - env: - VERSION: ${{ github.ref }} - - name: investigate aar - run: find . -name "*release.aar" - - name: investigate jar - run: find . -name "IOIO*.jar" \ No newline at end of file From 861e72cb4ef896e28139172d397e4a3145699bad Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Sun, 6 Sep 2020 13:37:14 +0200 Subject: [PATCH 2/2] Attempt to build all --- .github/workflows/make-all.yml | 19 +++++++++++++++++++ tools/make-all | 25 ------------------------- tools/make-all.sh | 30 ++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/make-all.yml delete mode 100755 tools/make-all create mode 100755 tools/make-all.sh diff --git a/.github/workflows/make-all.yml b/.github/workflows/make-all.yml new file mode 100644 index 00000000..1d5f6982 --- /dev/null +++ b/.github/workflows/make-all.yml @@ -0,0 +1,19 @@ +name: make all + +on: [ pull_request ] + +jobs: + buildTest: + name: make all + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ macOS-13 ] + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: make all + run: tools/make-all.sh diff --git a/tools/make-all b/tools/make-all deleted file mode 100755 index 0020102d..00000000 --- a/tools/make-all +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -PROJECTS="libusb libconn libbtstack libadb bootloader device_bootloader app_layer_v1 blink latency_tester" - -if [[ -z "$MAKE" ]] && which colormake > /dev/null 2>&1 ; then - MAKE=colormake -else - MAKE=make -fi - -if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then - PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh -else - PRJMAKEFILEGENERATOR=prjMakefilesGenerator.bat -fi - -for PROJ in $PROJECTS; do - echo =========================================== - echo $PROJ - echo =========================================== - if ! $PRJMAKEFILEGENERATOR firmware/$PROJ; then echo "WARNING: failed to regenerate Makefiles."; fi - if ! $MAKE -C firmware/$PROJ "$@"; then echo FAILURE ; exit 1 ; fi -done -echo SUCCESS - diff --git a/tools/make-all.sh b/tools/make-all.sh new file mode 100755 index 00000000..028f1eb4 --- /dev/null +++ b/tools/make-all.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +PROJECTS="libusb libconn libbtstack libadb bootloader device_bootloader app_layer_v1 blink latency_tester" + +if [[ -z "$MAKE" ]] && which colormake > /dev/null 2>&1 ; then + MAKE=colormake +else + MAKE=make +fi + +unameOut="$(uname -s)" +case "${unameOut}" in + Linux*) PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;; + Darwin*) PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;; + CYGWIN*) PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;; + //MINGW*) PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;; + *) PRJMAKEFILEGENERATOR=prjMakefilesGenerator.bat +esac + +echo PRJMAKEFILEGENERATOR=$PRJMAKEFILEGENERATOR + +for PROJ in $PROJECTS; do + echo =========================================== + echo make "$PROJ" + echo =========================================== + if ! $PRJMAKEFILEGENERATOR firmware/"$PROJ"; then echo "WARNING: failed to regenerate Makefiles."; fi + if ! $MAKE -C firmware/"$PROJ" "$@"; then echo FAILURE ; exit 1 ; fi +done +echo SUCCESS +