From 90a1598ddcfd86d05161350fb075cc5352afbc73 Mon Sep 17 00:00:00 2001
From: David Holdeman <david@chuckwagoncomputing.com>
Date: Thu, 2 Feb 2023 19:11:30 -0600
Subject: [PATCH] squishy squish (#5018)

---
 .github/workflows/build-firmware.yaml         | 101 ------------------
 .../build_current_bundle.bat                  |   2 -
 .../build_current_bundle.sh                   |  90 ----------------
 3 files changed, 193 deletions(-)
 delete mode 100644 misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
 delete mode 100755 misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh

diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
index 081482c2b0..0f4abb50a9 100644
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -339,13 +339,6 @@ jobs:
       working-directory: ./firmware/
       run: ./gen_enum_to_string.sh
 
-      # depends on gen_live_documentation.sh for instance TS_TOTAL_OUTPUT_SIZE
-    - name: Generate Default config
-      if: ${{ env.skip != 'true' }}
-      # todo: why do we even need this 'gen_config_default.sh' here?!
-      working-directory: ./firmware/
-      run: ./gen_config_default.sh
-
     - name: Generate Configs for build-target
       if: ${{ matrix.skip-config != 'yes' && env.skip != 'true' }}
       working-directory: ./firmware/
@@ -456,97 +449,3 @@ jobs:
       with:
         name: rusefi_bundle_${{matrix.build-target}}_autoupdate.zip
         path: ./artifacts/rusefi_bundle_${{matrix.build-target}}_autoupdate.zip
-
-  # here we build f407-discovery
-  build-primary-bundle:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check branch name
-      if: ${{ contains(github.ref_name, '.') }}
-      run: echo '::error::Branch names must not contain ".", this breaks firmware autoupdates.' && exit 1
-
-    - uses: actions/checkout@v3
-
-    - name: Checkout Submodules
-      run: |
-        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
-
-    - uses: actions/setup-java@v3
-      with:
-        distribution: 'zulu'
-        java-version: '8'
-
-    - name: Install multilib, mingw, and sshpass
-      run: |
-        sudo apt-get -o Acquire:Retries=3 update
-        sudo apt-get install gcc-multilib g++-multilib g++-mingw-w64 gcc-mingw-w64 sshpass mtools zip dosfstools
-
-    - name: Generate Enum Strings
-      working-directory: ./firmware/
-      run: ./gen_enum_to_string.sh
-
-    - name: Generate Default Configs
-      working-directory: ./firmware/
-      run: ./gen_config_default.sh
-
-    - name: Generate Live Documentation
-      working-directory: ./firmware/
-      run: ./gen_live_documentation.sh
-
-    # Build machines don't have arm-none-eabi gcc, so let's download it and put it on the path
-    - name: Download & Install GCC
-      env:
-        ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
-      run: |
-        ./firmware/provide_gcc.sh
-        echo "::add-path::`pwd`/gcc-arm-none-eabi/bin"
-
-    # Make sure the compiler we just downloaded works - just print out the version
-    - name: Test Compiler
-      run: arm-none-eabi-gcc -v
-
-    - name: primary Set SSH variables
-      env:
-        ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
-      run: |
-        if [ "${{github.event_name}}" = "push" ] && [ "${{github.ref}}" = "refs/heads/master" ] || [ "${{toJSON(inputs.lts)}}" = "true" ]; then
-          echo "::set-env name=RUSEFI_SSH_SERVER::${{secrets.RUSEFI_SSH_SERVER}}";
-          echo "::set-env name=RUSEFI_SSH_USER::${{secrets.RUSEFI_SSH_USER}}";
-          echo "::set-env name=RUSEFI_SSH_PASS::${{secrets.RUSEFI_SSH_PASS}}";
-        fi
-
-    - name: Build Primary Bundle
-      # 'OS="Windows_NT"' allows us to build Windows executable on unix
-      run: OS="Windows_NT" bash misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh ${{ github.ref_name }} ${{ toJSON(inputs.lts) }}
-
-    - name: Package Bundle
-      if: ${{( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || inputs.lts }}
-      run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh default default ${{ github.ref_name }} ${{ toJSON(inputs.lts) }}
-
-    - name: Attach console junit results
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: console primary junit
-        path: ./java_console/build/*.txt
-
-    - name: Upload 'all' .ini files
-      if: ${{( github.event_name == 'push' && github.ref == 'refs/heads/master' && env.skip != 'true' ) || inputs.lts }}
-      working-directory: ./firmware/tunerstudio/generated
-      run: |
-        ../upload_ini.sh rusefi.ini ${{ secrets.RUSEFI_ONLINE_FTP_USER }} ${{ secrets.RUSEFI_ONLINE_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}
-
-    - name: Upload primary bundle
-      if: ${{( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || inputs.lts }}
-      uses: actions/upload-artifact@v3
-      with:
-        name: rusefi_bundle.zip
-        path: ./artifacts/rusefi_bundle.zip
diff --git a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
deleted file mode 100644
index f241493e0a..0000000000
--- a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-bash.exe misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh
diff --git a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh
deleted file mode 100755
index f5a988df6c..0000000000
--- a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-# This script would compile firmware, dev console and win32 simulator into a single bundle file
-# This script depends on: zip
-
-SCRIPT_NAME="build_current_bundle"
-ROOT_FOLDER=$(pwd)
-echo "$SCRIPT_NAME Entering ROOT_FOLDER=$ROOT_FOLDER"
-
-echo "$SCRIPT_NAME.sh: Hello rusEFI build full bundle"
-date "+%a %D %T.%2S"
-
-export BUNDLE_NAME="default"
-
-# As of 2023 default bundle comes without hard-coded UART connectivity - USB is king for modern stm32 rusEFI boards
-# also OpenBLT is probably the more reasonable approach for UxART bootloader
-#cd firmware/bootloader
-#bash clean_bootloader.sh
-#bash compile_bootloader_discovery407.sh
-#[ -e bootloader_generated.hxx ] || { echo "FAILED TO COMPILE BOOTLOADER"; exit 1; }
-#pwd
-#cd ../..
-# At root folder here
-
-cd firmware
-date "+%a %D %T.%2S"
-
-echo "$SCRIPT_NAME: will be Erasing chip"
-
-[ -e flash_erase407.sh ] || { echo "NOT FOUND flash_erase.sh"; exit 1; }
-echo "$SCRIPT_NAME: Erasing chip"
-bash flash_erase407.sh
-
-echo "$SCRIPT_NAME: Building firmware"
-bash clean.sh
-
-bash update_version.sh
-
-bash clean_compile_two_versions.sh
-#[ -e deliver/rusefi_no_asserts.hex ] || { echo "Just to confirm - FAILED to compile no_asserts"; exit 1; }
-
-[ -e deliver/rusefi.hex ] || { echo "Just to confirm - FAILED to compile default DEBUG"; exit 1; }
-
-echo "$SCRIPT_NAME: Building DFU"
-if uname | grep "NT"; then
- chmod u+x ../misc/encedo_hex2dfu/hex2dfu.exe
-
-# ../misc/encedo_hex2dfu/hex2dfu.exe -i deliver/rusefi_no_asserts.hex -o deliver/rusefi_no_asserts.dfu
- ../misc/encedo_hex2dfu/hex2dfu.exe -i deliver/rusefi.hex -o deliver/rusefi.dfu
-else
- chmod u+x ../misc/encedo_hex2dfu/hex2dfu.bin
-# ../misc/encedo_hex2dfu/hex2dfu.bin -i deliver/rusefi_no_asserts.hex -o deliver/rusefi_no_asserts.dfu
- ../misc/encedo_hex2dfu/hex2dfu.bin -i deliver/rusefi.hex -o deliver/rusefi.dfu
-fi
-
-echo "${SCRIPT_NAME} ls -l deliver"
-ls -l deliver
-cd ..
-
-# At root folder here
-
-bash misc/jenkins/build_java_console.sh || { echo "rusefi_console.jar build FAILED"; exit 1; }
-
-bash misc/jenkins/build_simulator.sh || { echo "rusefi_simulator.exe build FAILED"; exit 1; }
-
-STM_ARCH="stm32f407"
-TIMESTAMP=$(date "+%Y%m%d_%H%M%S")
-
-if [ "$2" = "true" ]; then
-  FOLDER="rusefi.${1}.${STM_ARCH}"
-else
-  FOLDER="rusefi.snapshot.${STM_ARCH}"
-fi
-echo "$SCRIPT_NAME: folder variable1=$FOLDER"
-export FOLDER="temp/$FOLDER"
-echo "$SCRIPT_NAME: folder variable3=$FOLDER"
-
-pwd
-# DfuFlasher.java validates this prefix
-export BUNDLE_FULL_NAME="rusefi_bundle"
-bash misc/jenkins/build_working_folder.sh "$1" "$2"
-[ $? -eq 0 ] || { echo "$SCRIPT_NAME: ERROR: invoking build_working_folder.sh"; exit 1; }
-
-echo "$SCRIPT_NAME: Going back to root folder"
-cd "$ROOT_FOLDER"
-pwd
-
-echo "TIMESTAMP $(date "+%a %D %T.%2S")"
-pwd
-echo "exiting $SCRIPT_NAME"