Skip to content

Commit 8c508a4

Browse files
Update CI runners and documentation to not run on Ubuntu 20.04 (UBC-Thunderbots#3427)
* remove references to Ubuntu 20.04 and update CI * take up vincent's suggestion * Update CI installation dependencies * possibly fix precommit * fix pre-commit * [pre-commit.ci lite] apply automatic fixes * fix systemd hook * maybe the issue is default initialization? --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
1 parent c8a1b5a commit 8c508a4

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

.github/workflows/main.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
multiplatform-build:
1515
strategy:
1616
matrix:
17-
platform: [ ubuntu-22.04, ubuntu-24.04 ]
17+
platform: [ ubuntu-24.04 ]
1818

1919
name: Ubuntu Alternate Builds
2020
runs-on: ${{ matrix.platform }}
@@ -50,7 +50,7 @@ jobs:
5050
5151
software-tests:
5252
name: Software Tests
53-
runs-on: ubuntu-20.04
53+
runs-on: ubuntu-22.04
5454
steps:
5555
# checks-out the repository under $GITHUB_WORKSPACE
5656
- uses: actions/checkout@v4
@@ -72,7 +72,7 @@ jobs:
7272
7373
robot-tests:
7474
name: Robot Software Tests
75-
runs-on: ubuntu-20.04
75+
runs-on: ubuntu-22.04
7676
steps:
7777
# checks-out the repository under $GITHUB_WORKSPACE
7878
- uses: actions/checkout@v4
@@ -108,7 +108,7 @@ jobs:
108108
109109
simulated-gameplay-tests:
110110
name: Simulated Gameplay Tests
111-
runs-on: ubuntu-20.04
111+
runs-on: ubuntu-22.04
112112
steps:
113113
# checks-out the repository under $GITHUB_WORKSPACE
114114
- uses: actions/checkout@v4
@@ -146,7 +146,7 @@ jobs:
146146
147147
autorefd-game:
148148
name: AutoRef'd Game (3 Minutes)
149-
runs-on: ubuntu-20.04
149+
runs-on: ubuntu-22.04
150150
steps:
151151
# checks-out the repository under $GITHUB_WORKSPACE
152152
- uses: actions/checkout@v4

.github/workflows/pre-commit.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
jobs:
1515
formatting-check:
1616
name: Formatting and FSM diagram generation with pre-commit-ci-lite
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-22.04
1818
if: github.event.pull_request.draft == false
1919
steps:
2020
# checks-out the repository under $GITHUB_WORKSPACE
@@ -27,9 +27,9 @@ jobs:
2727
- name: Install pip
2828
run: curl -sS https://bootstrap.pypa.io/get-pip.py | python
2929

30-
- uses: pre-commit/[email protected].0
30+
- uses: pre-commit/[email protected].1
3131

32-
- uses: pre-commit-ci/lite-action@v1.0.1
32+
- uses: pre-commit-ci/lite-action@v1.1.0
3333
name: Run pre-commit-ci-lite
3434
if: always()
3535

docs/getting-started-wsl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ If you are not using Windows 11 and would prefer not to upgrade, you can follow
3939
3. Now, let's install Ubuntu.
4040
- Download the WSL2 kernel from [here](https://docs.microsoft.com/en-us/windows/wsl/wsl2-kernel).
4141
- Open a PowerShell window and run command `wsl --set-default-version 2` to use WSL2 by default.
42-
- Install Ubuntu 20.04 LTS, Ubuntu 22.04 LTS or Ubuntu 24.04 LTS from the Microsoft Store.
42+
- Install Ubuntu 22.04 LTS or Ubuntu 24.04 LTS from the Microsoft Store.
4343
- Open the Ubuntu app in the Start menu. It will open a command prompt and ask you to create a new UNIX username and password for your WSL2 Ubuntu installation.
4444
4545
### X Server Setup

docs/getting-started.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ These instructions assume you have a basic understanding of Linux and the comman
6868

6969
We currently only support Linux, specifically Ubuntu.
7070

71-
If you have a X86_64 machine, we support Ubuntu 20.04 LTS, Ubuntu 22.04 LTS and Ubuntu 24.04 LTS.
71+
If you have a X86_64 machine, we support Ubuntu 22.04 LTS and Ubuntu 24.04 LTS.
7272

7373
If you have a ARM64 (also known as AARCH64) machine, we support Ubuntu 24.04 LTS.
7474

7575
You are welcome to use a different version or distribution of Linux, but may need to make some tweaks in order for things to work.
7676

77-
You can use Ubuntu 20.04 LTS, Ubuntu 22.04 LTS or Ubuntu 24.04 LTS inside Windows through Windows Subsystem for Linux, by following [this guide](./getting-started-wsl.md). **Running and developing Thunderbots on Windows is experimental and not officially supported.**
77+
You can use Ubuntu 22.04 LTS or Ubuntu 24.04 LTS inside Windows through Windows Subsystem for Linux, by following [this guide](./getting-started-wsl.md). **Running and developing Thunderbots on Windows is experimental and not officially supported.**
7878

7979
### Getting the Code
8080

environment_setup/setup_software.sh

+5
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ if [[ $(lsb_release -rs) == "22.04" ]] || [[ $(lsb_release -rs) == "24.04" ]]; t
104104
sudo mv /tmp/tbots_download_cache/85-brltty.rules /usr/lib/udev/rules.d/85-brltty.rules
105105
fi
106106

107+
if [[ $(lsb_release -rs) == "22.04" ]]; then
108+
# This is required for clang-format
109+
host_software_packages+=(libtinfo5)
110+
fi
111+
107112
virtualenv_opt_args=""
108113
if [[ $(lsb_release -rs) == "24.04" ]]; then
109114
host_software_packages+=(python3-pyqt6)

src/software/embedded/ansible/tasks/setup_systemd.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
copy_links: true
1717

1818
- name: Compute Thunderloop MD5 Hash
19-
command: '/home/{{ ansible_user }}/hash_thunderloop_binary.sh'
19+
ansible.builtin.command: "/home/{{ ansible_user }}/hash_thunderloop_binary.sh"
2020
register: result
21+
changed_when: true
2122

2223
- name: Sync Thunderloop systemd file
2324
become_method: ansible.builtin.sudo

src/software/estop/threaded_estop_reader_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ TEST(ThreadedEstopReaderTest, estop_tick_is_called_multiple_times)
4444
std::mutex m;
4545
std::unique_lock lock(m);
4646
std::condition_variable cv;
47-
bool ready;
47+
bool ready = false;
4848

4949
EXPECT_CALL(*mock_uart_ptr, flushSerialPort(_)).WillRepeatedly(Return(true));
5050

0 commit comments

Comments
 (0)