From 4845b510fe28b26b03a26fd52aba3cb78908bd61 Mon Sep 17 00:00:00 2001 From: Nathan Schulte <8540239+nmschulte@users.noreply.github.com> Date: Fri, 13 Jan 2023 04:35:59 -0600 Subject: [PATCH] GitHub actions use apt-spy2, retry apt-get update (#4967) * GitHub actions retry apt-get * use primary (non-azure) Ubuntu archive * remove newline in build-android.yaml * apt-spy2 --- .github/workflows/build-android.yaml | 6 ++++-- .github/workflows/build-firmware.yaml | 6 ++++-- .github/workflows/build-rusEFI-console.yaml | 5 ++++- .github/workflows/build-simulator.yaml | 3 ++- .github/workflows/build-tsplugin-body.yaml | 5 ++++- .github/workflows/build-unit-tests.yaml | 3 ++- .github/workflows/gen-configs.yaml | 5 ++++- .github/workflows/gen-diffs.yaml | 3 ++- .github/workflows/gen-docs.yaml | 3 ++- .github/workflows/gen-ibom.yaml | 3 ++- .github/workflows/set-date.yaml | 5 ++++- 11 files changed, 34 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index dca5ce5a7e..c25d3927fd 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -16,13 +16,15 @@ jobs: java-version: '8' - name: Install Tools - run: sudo apt-get install mtools + run: | + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit + sudo apt-get -o Acquire::Retries=3 update + sudo apt-get install mtools - name: Generate Configs, Enums & Live Documentation working-directory: ./firmware/ run: ./gen_default_everything.sh - - name: Test Compiler run: javac -version diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index f0f92d62fe..9f09ed9af9 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -293,7 +293,8 @@ jobs: - name: Install multilib, mingw, sshpass and mtools if: ${{ env.skip != 'true' }} run: | - sudo apt-get update + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit + sudo apt-get -o Acquire::Retries=3 update sudo apt-get install gcc-multilib g++-multilib g++-mingw-w64 gcc-mingw-w64 sshpass mtools sudo apt-get install zip sudo apt-get install dosfstools @@ -441,7 +442,8 @@ jobs: - name: Install multilib, mingw, and sshpass run: | - sudo apt-get update + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit + 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 diff --git a/.github/workflows/build-rusEFI-console.yaml b/.github/workflows/build-rusEFI-console.yaml index 1ac4166f71..43843cc8b0 100644 --- a/.github/workflows/build-rusEFI-console.yaml +++ b/.github/workflows/build-rusEFI-console.yaml @@ -20,7 +20,10 @@ jobs: run: javac -version - name: Install Tools - run: sudo apt-get install sshpass mtools + run: | + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit + sudo apt-get -o Acquire::Retries=3 update + sudo apt-get install sshpass mtools - name: Generate Configs, Enums & Live Documentation working-directory: ./firmware/ diff --git a/.github/workflows/build-simulator.yaml b/.github/workflows/build-simulator.yaml index 6313b4eb33..f5486363a9 100644 --- a/.github/workflows/build-simulator.yaml +++ b/.github/workflows/build-simulator.yaml @@ -22,7 +22,8 @@ jobs: - name: Install multilib run: | - sudo apt-get update + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit + sudo apt-get -o Acquire::Retries=3 update sudo apt-get install gcc-multilib g++-multilib mtools dosfstools zip - name: Generate Configs, Enums & Live Documentation diff --git a/.github/workflows/build-tsplugin-body.yaml b/.github/workflows/build-tsplugin-body.yaml index c9248f11ac..ab72fbb0ee 100644 --- a/.github/workflows/build-tsplugin-body.yaml +++ b/.github/workflows/build-tsplugin-body.yaml @@ -19,7 +19,10 @@ jobs: run: javac -version - name: Install Tools - run: sudo apt-get install sshpass + run: | + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit + sudo apt-get -o Acquire::Retries=3 update + sudo apt-get install sshpass - name: Build TS plugin body working-directory: ./java_tools/ts_plugin diff --git a/.github/workflows/build-unit-tests.yaml b/.github/workflows/build-unit-tests.yaml index 4062e828b3..8abef0b28b 100644 --- a/.github/workflows/build-unit-tests.yaml +++ b/.github/workflows/build-unit-tests.yaml @@ -23,7 +23,8 @@ jobs: - name: Install required software (ubuntu) if: ${{ matrix.os != 'macos-latest' }} run: | - sudo apt-get update + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit + sudo apt-get -o Acquire::Retries=3 update sudo apt-get install mtools zip dosfstools sshpass lcov valgrind - name: Install required software (macos) diff --git a/.github/workflows/gen-configs.yaml b/.github/workflows/gen-configs.yaml index 60001cbd2e..7b762d9c46 100644 --- a/.github/workflows/gen-configs.yaml +++ b/.github/workflows/gen-configs.yaml @@ -16,7 +16,10 @@ jobs: fetch-depth: 0 - name: Install Tools - run: sudo apt-get install sshpass sshpass mtools + run: | + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit + sudo apt-get -o Acquire::Retries=3 update + sudo apt-get install sshpass sshpass mtools - name: Generate Enum Strings working-directory: ./firmware/ diff --git a/.github/workflows/gen-diffs.yaml b/.github/workflows/gen-diffs.yaml index 0b5e2de6f7..cb2f8a0d2d 100644 --- a/.github/workflows/gen-diffs.yaml +++ b/.github/workflows/gen-diffs.yaml @@ -17,8 +17,9 @@ jobs: - name: Install sshpass, kicad, and tk bindings run: | + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit sudo add-apt-repository --yes ppa:kicad/kicad-6.0-releases - sudo apt-get update + sudo apt-get -o Acquire::Retries=3 update sudo apt-get install sshpass kicad python3-pip python3-tk scour librsvg2-bin pip install python-dateutil pygubu diff --git a/.github/workflows/gen-docs.yaml b/.github/workflows/gen-docs.yaml index 8d90de1b59..04dfdde6b3 100644 --- a/.github/workflows/gen-docs.yaml +++ b/.github/workflows/gen-docs.yaml @@ -15,7 +15,8 @@ jobs: - name: Install prerequisite software run: | - sudo apt-get update + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit + sudo apt-get -o Acquire::Retries=3 update sudo apt-get install doxygen graphviz sshpass - name: Set FTP variables diff --git a/.github/workflows/gen-ibom.yaml b/.github/workflows/gen-ibom.yaml index 1f01c6962c..02f36e61d6 100644 --- a/.github/workflows/gen-ibom.yaml +++ b/.github/workflows/gen-ibom.yaml @@ -16,8 +16,9 @@ jobs: - name: Install prerequisite software run: | + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit sudo add-apt-repository ppa:kicad/kicad-5.1-releases - sudo apt-get update + sudo apt-get -o Acquire::Retries=3 update sudo apt-get install kicad sshpass - name: Set SSH variables diff --git a/.github/workflows/set-date.yaml b/.github/workflows/set-date.yaml index 3e0a5935dc..6f5b71f693 100644 --- a/.github/workflows/set-date.yaml +++ b/.github/workflows/set-date.yaml @@ -22,7 +22,10 @@ jobs: fetch-depth: 0 - name: Install Tools - run: sudo apt-get install subversion + run: | + sudo gem install apt-spy2 && sudo time apt-spy2 fix --commit + sudo apt-get -o Acquire::Retries=3 update + sudo apt-get install subversion - name: Update version header in git working-directory: ./firmware/