diff options
| author | David Lechner <david@pybricks.com> | 2022-06-08 11:32:17 -0500 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-06-17 16:56:41 +1000 |
| commit | 17f0297c1ac274b4e9f1040e8282a592715e8cb8 (patch) | |
| tree | 0eb48c6dff13e65e0685ead4763267ea706bd832 | |
| parent | bada8b3cada2990d73e6402b029cfb699f3d9438 (diff) | |
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 <david@pybricks.com>
| -rw-r--r-- | .github/workflows/code_formatting.yml | 2 | ||||
| -rwxr-xr-x | tools/ci.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml index aab347d78..5c0196d2e 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 5d9f8d479..6c3914b14 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 |