From 04cfee6c65beaad5b27cde6d10cf43866e203f69 Mon Sep 17 00:00:00 2001 From: David Holdeman Date: Sun, 29 Jan 2023 03:43:27 -0600 Subject: [PATCH] Lean submodule fetching (don't merge until all green) (#5013) * remove submodules * check out ChibiOS * oops, try depth * check skip, get libfirmware * lua * uzlib * luaaa * wideband_firmware * remove submodules * googletest * libfirmware * lua * luaaa * wideband_firmware * don't need skip * remove submodules * ChibiOS * libfirmware * lua * wideband_firmware * remove submodules, checkout ibom * remove submodules * remove submodules, checkout firmware stuff * remove submodules * remove submodules * googletest * googletest * libfirmware * lua, wideband_firmware * hw lib * remove fetch-depth: 0 * luaformatter * openblt, luaformatter * install unit test stuff * try fetch depth 2 * need luaformatter for all builds --- .github/workflows/build-android.yaml | 11 ++++++-- .github/workflows/build-firmware.yaml | 31 ++++++++++++++++++--- .github/workflows/build-rusEFI-console.yaml | 11 ++++++-- .github/workflows/build-simulator.yaml | 12 ++++++-- .github/workflows/build-tsplugin-body.yaml | 3 +- .github/workflows/build-unit-tests.yaml | 11 ++++++-- .github/workflows/gen-configs.yaml | 11 ++++++-- .github/workflows/gen-diffs.yaml | 7 +++-- .github/workflows/gen-docs.yaml | 2 -- .github/workflows/gen-ibom.yaml | 7 +++-- .github/workflows/gen-pinouts.yaml | 2 -- .github/workflows/hardware-ci.yaml | 12 ++++++-- .github/workflows/set-date.yaml | 2 -- 13 files changed, 91 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index c25d3927fd..c7037a8993 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -8,8 +8,15 @@ jobs: steps: - uses: actions/checkout@v3 - with: - submodules: recursive + + - name: Checkout Submodules + 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 + - uses: actions/setup-java@v3 with: distribution: 'zulu' diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index 06ea5040f0..81b1ea7736 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -296,8 +296,19 @@ jobs: - uses: actions/checkout@v3 if: ${{ env.skip != 'true' }} - with: - submodules: recursive + + - name: Checkout Submodules + if: ${{ env.skip != 'true' }} + 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 if: ${{ env.skip != 'true' }} @@ -450,9 +461,21 @@ jobs: - 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 - with: - submodules: recursive + + - 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' diff --git a/.github/workflows/build-rusEFI-console.yaml b/.github/workflows/build-rusEFI-console.yaml index 2132d938e2..b392aad17f 100644 --- a/.github/workflows/build-rusEFI-console.yaml +++ b/.github/workflows/build-rusEFI-console.yaml @@ -8,8 +8,15 @@ jobs: steps: - uses: actions/checkout@v3 - with: - submodules: recursive + + - name: Checkout Submodules + 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/luaformatter - uses: actions/setup-java@v3 with: diff --git a/.github/workflows/build-simulator.yaml b/.github/workflows/build-simulator.yaml index f5486363a9..13677730f3 100644 --- a/.github/workflows/build-simulator.yaml +++ b/.github/workflows/build-simulator.yaml @@ -9,8 +9,16 @@ jobs: steps: - uses: actions/checkout@v3 - with: - submodules: recursive + + - 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/controllers/lua/luaaa + git submodule update --init --depth=1 firmware/controllers/can/wideband_firmware + - uses: actions/setup-java@v3 with: distribution: 'zulu' diff --git a/.github/workflows/build-tsplugin-body.yaml b/.github/workflows/build-tsplugin-body.yaml index ab72fbb0ee..417ff13d47 100644 --- a/.github/workflows/build-tsplugin-body.yaml +++ b/.github/workflows/build-tsplugin-body.yaml @@ -8,8 +8,7 @@ jobs: steps: - uses: actions/checkout@v3 - with: - submodules: recursive + - uses: actions/setup-java@v3 with: distribution: 'zulu' diff --git a/.github/workflows/build-unit-tests.yaml b/.github/workflows/build-unit-tests.yaml index 8abef0b28b..423de3c6f8 100644 --- a/.github/workflows/build-unit-tests.yaml +++ b/.github/workflows/build-unit-tests.yaml @@ -12,9 +12,14 @@ jobs: steps: - uses: actions/checkout@v3 - with: - submodules: recursive - fetch-depth: 0 + + - name: Checkout Submodules + 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 - name: Discover cores if: ${{ matrix.os != 'macos-latest' }} diff --git a/.github/workflows/gen-configs.yaml b/.github/workflows/gen-configs.yaml index 7b762d9c46..8d27bfe5ae 100644 --- a/.github/workflows/gen-configs.yaml +++ b/.github/workflows/gen-configs.yaml @@ -11,9 +11,14 @@ jobs: steps: - uses: actions/checkout@v3 - with: - submodules: recursive - fetch-depth: 0 + + - name: Checkout Submodules + 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 - name: Install Tools run: | diff --git a/.github/workflows/gen-diffs.yaml b/.github/workflows/gen-diffs.yaml index cb2f8a0d2d..a85890d4e5 100644 --- a/.github/workflows/gen-diffs.yaml +++ b/.github/workflows/gen-diffs.yaml @@ -12,8 +12,11 @@ jobs: steps: - uses: actions/checkout@v3 with: - submodules: recursive - fetch-depth: 0 + fetch-depth: 2 + + - name: Checkout Submodules + run: | + git submodule update --init --depth=1 hardware/rusefi_lib - name: Install sshpass, kicad, and tk bindings run: | diff --git a/.github/workflows/gen-docs.yaml b/.github/workflows/gen-docs.yaml index 04dfdde6b3..a44315d531 100644 --- a/.github/workflows/gen-docs.yaml +++ b/.github/workflows/gen-docs.yaml @@ -10,8 +10,6 @@ jobs: steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Install prerequisite software run: | diff --git a/.github/workflows/gen-ibom.yaml b/.github/workflows/gen-ibom.yaml index 02f36e61d6..57738b77cb 100644 --- a/.github/workflows/gen-ibom.yaml +++ b/.github/workflows/gen-ibom.yaml @@ -10,9 +10,10 @@ jobs: steps: - uses: actions/checkout@v3 - with: - submodules: recursive - fetch-depth: 0 + + - name: Checkout Submodules + run: | + git submodule update --init --depth=1 hardware/InteractiveHtmlBom - name: Install prerequisite software run: | diff --git a/.github/workflows/gen-pinouts.yaml b/.github/workflows/gen-pinouts.yaml index 6fed186252..fe3ae4b342 100644 --- a/.github/workflows/gen-pinouts.yaml +++ b/.github/workflows/gen-pinouts.yaml @@ -15,8 +15,6 @@ jobs: steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Install prerequisite software env: diff --git a/.github/workflows/hardware-ci.yaml b/.github/workflows/hardware-ci.yaml index 2792eb6920..55f6758a5c 100644 --- a/.github/workflows/hardware-ci.yaml +++ b/.github/workflows/hardware-ci.yaml @@ -35,8 +35,16 @@ jobs: steps: - uses: actions/checkout@v3 - with: - submodules: recursive + + - 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/controllers/lua/luaaa + git submodule update --init --depth=1 firmware/controllers/can/wideband_firmware - name: Identify Agent run: uname -a diff --git a/.github/workflows/set-date.yaml b/.github/workflows/set-date.yaml index 6f5b71f693..eee07b2009 100644 --- a/.github/workflows/set-date.yaml +++ b/.github/workflows/set-date.yaml @@ -18,8 +18,6 @@ jobs: steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Install Tools run: |