From 17f0297c1ac274b4e9f1040e8282a592715e8cb8 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Wed, 8 Jun 2022 11:32:17 -0500 Subject: [PATCH] tools/ci.sh: Drop ppa requirement for code formatting CI. The CI scripts were using a PPA to get a backported version of uncrustify on Ubuntu 20.04. However, this causes CI to intermittently fail due to connection issues to launchpad.net or the key server. Ubuntu 22.04 has a newer version of uncrustify removing the need for the PPA. Ubuntu 22.04 is now in beta on GitHub actions, so it can be used. Signed-off-by: David Lechner --- .github/workflows/code_formatting.yml | 2 +- tools/ci.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml index aab347d78e..5c0196d2ed 100644 --- a/.github/workflows/code_formatting.yml +++ b/.github/workflows/code_formatting.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 diff --git a/tools/ci.sh b/tools/ci.sh index 5d9f8d4793..6c3914b144 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -18,7 +18,6 @@ function ci_gcc_arm_setup { # code formatting function ci_code_formatting_setup { - sudo apt-add-repository --yes --update ppa:pybricks/ppa sudo apt-get install uncrustify pip3 install black uncrustify --version