From 23fbc3f8f4330d92b855995de1980fd9b6e50000 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 4 Nov 2023 13:18:55 -0400 Subject: [PATCH] only:Unit Tests on Windows --- .github/workflows/build-unit-tests-windows.yaml | 3 +++ .github/workflows/build-unit-tests.yaml | 6 +++++- firmware/hw_layer/mass_storage/create_ini_image.sh | 6 ++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-unit-tests-windows.yaml b/.github/workflows/build-unit-tests-windows.yaml index 4299454dce..4fa7fcbd64 100644 --- a/.github/workflows/build-unit-tests-windows.yaml +++ b/.github/workflows/build-unit-tests-windows.yaml @@ -33,6 +33,9 @@ jobs: with: version: 8.1.0 + + + - name: Print bash version working-directory: . run: bash --version diff --git a/.github/workflows/build-unit-tests.yaml b/.github/workflows/build-unit-tests.yaml index 85426e9823..47d85bcf08 100644 --- a/.github/workflows/build-unit-tests.yaml +++ b/.github/workflows/build-unit-tests.yaml @@ -36,12 +36,16 @@ jobs: run: | brew install mtools zip dosfstools + - name: Print bash version + working-directory: . + run: bash --version + - name: Test Java Compiler run: javac -version - name: Generate Configs, Enums & Live Documentation working-directory: ./firmware/ - run: ./gen_default_everything.sh + run: bash gen_default_everything.sh - name: Print Compiler version # NOTE: on mac, this is actually symlink'd to clang, not gcc, but that's ok - we want to build on both diff --git a/firmware/hw_layer/mass_storage/create_ini_image.sh b/firmware/hw_layer/mass_storage/create_ini_image.sh index 74b70dba42..402bc08a80 100755 --- a/firmware/hw_layer/mass_storage/create_ini_image.sh +++ b/firmware/hw_layer/mass_storage/create_ini_image.sh @@ -6,10 +6,8 @@ # fail on error set -e -KERNEL_NAME="$(expr substr $(uname -s) 1 6)" -echo $KERNEL_NAME -if [ $KERNEL_NAME == "CYGWIN" ]; then - echo No image on CYGWIN +if [ "$(expr substr $(uname -s) 1 6)" == "CYGWIN" || "$(expr substr $(uname -s) 1 5)" == "MINGW"]; then + echo No image on $(uname -s) exit 0 fi