diff --git a/.github/workflows/build-rusEFI-console.yaml b/.github/workflows/build-rusEFI-console.yaml index 0b25a585fd..de1b516cb2 100644 --- a/.github/workflows/build-rusEFI-console.yaml +++ b/.github/workflows/build-rusEFI-console.yaml @@ -32,11 +32,10 @@ jobs: sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh sudo bash misc/actions/ubuntu-install-tools.sh - - name: Build Config Definition Base and Enum to String + - name: Build All Java working-directory: ./java_tools/ run: | - ./gradlew :config_definition_base:shadowJar - ./gradlew :enum_to_string:shadowJar + ./gradlew shadowJar - name: Generate Enums & Live Documentation working-directory: ./firmware/ @@ -45,7 +44,7 @@ jobs: - name: Print GCC version run: gcc -v - - name: Test console + - name: All Java Tests # at the moment 'jar' task does not depend on tests?! maybe because tests take some time? working-directory: ./java_tools run: ./gradlew test @@ -64,29 +63,6 @@ jobs: name: gradle junit path: '**/build/test-results/test/TEST-*.xml' - - name: Build console - working-directory: ./java_tools - run: ./gradlew :ui:shadowJar - - - name: Attach Ant console junit results - if: always() - uses: actions/upload-artifact@v4 - with: - name: console junit - path: ./java_console/build/*.txt - - - name: Configuration Definition CI, without pushing new .jar - working-directory: ./java_tools - run: ./gradlew :config_definition:shadowJar - - - name: Test everything java_tools gradle while we are here - working-directory: ./java_tools - run: ./gradlew test - - - name: Configuration Definition and other tools CI, without pushing new .jars - working-directory: ./java_tools - run: ./gradlew shadowJar - # this job focuses of tool validation so we do not push fresh enums here - name: Generate Enums using freshly compiled tool working-directory: ./firmware/ diff --git a/.github/workflows/build-simulator.yaml b/.github/workflows/build-simulator.yaml index ff68c8e83f..29f3d8eb82 100644 --- a/.github/workflows/build-simulator.yaml +++ b/.github/workflows/build-simulator.yaml @@ -39,7 +39,7 @@ jobs: - name: Gradle autotest java Using freshly generated java code working-directory: ./java_tools - run: ./gradlew :autotest:shadowJar + run: ./gradlew shadowJar - name: Compile Linux Simulator working-directory: ./simulator/ @@ -58,10 +58,6 @@ jobs: git status ls -l simulator/generated/ - - name: Gradle tune-tools - working-directory: ./java_tools - run: ./gradlew :tune-tools:shadowJar - - name: Convert .bin from Linux Simulator into .xml working-directory: ./simulator/ run: | diff --git a/.github/workflows/gen-configs.yaml b/.github/workflows/gen-configs.yaml index 8e80156d29..45ebcf5a44 100644 --- a/.github/workflows/gen-configs.yaml +++ b/.github/workflows/gen-configs.yaml @@ -12,14 +12,9 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Checkout Submodules + - name: Checkout Submodules Without ChibiOS run: | - git submodule update --init --depth=1 unit_tests/googletest - git submodule update --init --depth=1 firmware/libfirmware - git submodule update --init --depth=1 firmware/ext/lua - git submodule update --init --depth=1 firmware/controllers/lua/luaaa - git submodule update --init --depth=1 firmware/controllers/can/wideband_firmware - git submodule update --init --depth=1 java_console/peak-can-basic + misc/git_scripts/common_submodule_init_without_chibios.sh - uses: actions/setup-java@v4 with: @@ -38,9 +33,7 @@ jobs: - name: Configuration Definition and Enum to String CI, without pushing new .jar working-directory: ./java_tools run: | - ./gradlew :config_definition:shadowJar - ./gradlew :config_definition_base:shadowJar - ./gradlew :enum_to_string:shadowJar + ./gradlew shadowJar - name: Generate Live Documentation working-directory: ./firmware/ diff --git a/.github/workflows/hardware-ci.yaml b/.github/workflows/hardware-ci.yaml index c2e31ac9af..2c4fdf0183 100644 --- a/.github/workflows/hardware-ci.yaml +++ b/.github/workflows/hardware-ci.yaml @@ -86,9 +86,7 @@ jobs: - name: Configuration Definition and Enum to String CI, without pushing new .jar working-directory: ./java_tools run: | - ./gradlew :config_definition:shadowJar - ./gradlew :config_definition_base:shadowJar - ./gradlew :enum_to_string:shadowJar + ./gradlew shadowJar - name: Generate All Configs working-directory: ./firmware/ diff --git a/misc/git_scripts/common_submodule_init.sh b/misc/git_scripts/common_submodule_init.sh index bd0db313a7..bf1e1e2577 100755 --- a/misc/git_scripts/common_submodule_init.sh +++ b/misc/git_scripts/common_submodule_init.sh @@ -1,13 +1,6 @@ #!/bin/bash - git submodule update --init --depth=1 .github/workflows/hw-ci/gethla +misc/git_scripts/common_submodule_init_without_chibios.sh + git submodule update --init --depth=1 firmware/ChibiOS git submodule update --init --depth=1 firmware/ChibiOS-Contrib - git submodule update --init --depth=1 firmware/libfirmware - git submodule update --init --depth=1 firmware/ext/lua - git submodule update --init --depth=1 firmware/ext/uzlib - git submodule update --init --depth=1 firmware/ext/openblt - git submodule update --init --depth=1 firmware/controllers/lua/luaaa - git submodule update --init --depth=1 firmware/controllers/can/wideband_firmware - git submodule update --init --depth=1 java_console/luaformatter - git submodule update --init --depth=1 java_console/peak-can-basic diff --git a/misc/git_scripts/common_submodule_init_without_chibios.sh b/misc/git_scripts/common_submodule_init_without_chibios.sh new file mode 100755 index 0000000000..80d188bec8 --- /dev/null +++ b/misc/git_scripts/common_submodule_init_without_chibios.sh @@ -0,0 +1,12 @@ +#!/bin/bash + + git submodule update --init --depth=1 .github/workflows/hw-ci/gethla + git submodule update --init --depth=1 firmware/libfirmware + git submodule update --init --depth=1 firmware/ext/lua + git submodule update --init --depth=1 firmware/ext/uzlib + git submodule update --init --depth=1 firmware/ext/openblt + git submodule update --init --depth=1 firmware/controllers/lua/luaaa + git submodule update --init --depth=1 firmware/controllers/can/wideband_firmware + git submodule update --init --depth=1 java_console/luaformatter + git submodule update --init --depth=1 java_console/peak-can-basic + git submodule update --init --depth=1 unit_tests/googletest