prep for ubuntu 24.04 (#32307)

* update to ubuntu 24.04

* latest

* revert those

* fix that

* vla

* try that

* fix uid

* keep 20.04 support

* just prep for now
This commit is contained in:
Adeeb Shihadeh 2024-04-28 16:24:04 -07:00 committed by GitHub
parent 1b0ce23bbe
commit a44add160e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 29 additions and 31 deletions

View File

@ -24,7 +24,7 @@ body:
id: os-version
attributes:
label: OS Version
placeholder: Ubuntu 20.04
placeholder: Ubuntu 24.04
validations:
required: true

View File

@ -12,7 +12,7 @@ env:
jobs:
badges:
name: create badges
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: github.repository == 'commaai/openpilot'
permissions:
contents: write

View File

@ -20,7 +20,7 @@ env:
jobs:
docs:
name: build docs
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
- uses: actions/checkout@v4

View File

@ -11,7 +11,7 @@ env:
jobs:
build_prebuilt:
name: build prebuilt
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: github.repository == 'commaai/openpilot'
env:
PUSH_IMAGE: true

View File

@ -12,7 +12,7 @@ jobs:
ImageOS: ubuntu20
container:
image: ghcr.io/commaai/openpilot-base:latest
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: github.repository == 'commaai/openpilot'
permissions:
checks: read

View File

@ -8,7 +8,7 @@ on:
jobs:
bump_submodules:
name: bump_submodules
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/commaai/openpilot-base:latest
if: github.repository == 'commaai/openpilot'
@ -34,7 +34,7 @@ jobs:
labels: bot
package_updates:
name: package_updates
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/commaai/openpilot-base:latest
if: github.repository == 'commaai/openpilot'

View File

@ -26,7 +26,7 @@ env:
jobs:
build_release:
name: build release
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
STRIPPED_DIR: /tmp/releasepilot
steps:
@ -71,7 +71,7 @@ jobs:
((github.repository == 'commaai/openpilot') &&
((github.event_name != 'pull_request') ||
(github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && '["x86_64", "aarch64"]' || '["x86_64"]' ) }}
runs-on: ${{ (matrix.arch == 'aarch64') && 'namespace-profile-arm64-2x8' || 'ubuntu-20.04' }}
runs-on: ${{ (matrix.arch == 'aarch64') && 'namespace-profile-arm64-2x8' || 'ubuntu-latest' }}
steps:
- uses: actions/checkout@v4
with:
@ -87,7 +87,7 @@ jobs:
strategy:
matrix:
arch: ${{ fromJson( (github.repository == 'commaai/openpilot') && '["x86_64", "aarch64"]' || '["x86_64"]' ) }}
runs-on: ${{ (matrix.arch == 'aarch64') && 'namespace-profile-arm64-2x8' || 'ubuntu-20.04' }}
runs-on: ${{ (matrix.arch == 'aarch64') && 'namespace-profile-arm64-2x8' || 'ubuntu-latest' }}
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
steps:
- uses: actions/checkout@v4
@ -104,7 +104,7 @@ jobs:
docker_push_multiarch:
name: docker push multiarch tag
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
needs: [docker_push]
steps:
@ -123,7 +123,7 @@ jobs:
name: static analysis
runs-on: ${{ ((github.repository == 'commaai/openpilot') &&
((github.event_name != 'pull_request') ||
(github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-20.04' }}
(github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }}
steps:
- uses: actions/checkout@v4
with:
@ -136,7 +136,7 @@ jobs:
valgrind:
name: valgrind
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
@ -156,7 +156,7 @@ jobs:
name: unit tests
runs-on: ${{ ((github.repository == 'commaai/openpilot') &&
((github.event_name != 'pull_request') ||
(github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-20.04' }}
(github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }}
steps:
- uses: actions/checkout@v4
with:
@ -187,7 +187,7 @@ jobs:
name: process replay
runs-on: ${{ ((github.repository == 'commaai/openpilot') &&
((github.event_name != 'pull_request') ||
(github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-20.04' }}
(github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }}
steps:
- uses: actions/checkout@v4
with:
@ -234,7 +234,7 @@ jobs:
regen:
name: regen
runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-latest'
steps:
- uses: actions/checkout@v4
with:
@ -259,7 +259,7 @@ jobs:
test_modeld:
name: model tests
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
@ -294,7 +294,7 @@ jobs:
name: cars
runs-on: ${{ ((github.repository == 'commaai/openpilot') &&
((github.event_name != 'pull_request') ||
(github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-20.04' }}
(github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }}
strategy:
fail-fast: false
matrix:
@ -329,7 +329,7 @@ jobs:
car_docs_diff:
name: PR comments
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
steps:
- uses: actions/checkout@v4
@ -383,7 +383,7 @@ jobs:
create_ui_report:
name: Create UI Report
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:

View File

@ -22,7 +22,7 @@ env:
jobs:
plotjuggler:
name: plotjuggler
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
- uses: actions/checkout@v4
@ -39,7 +39,7 @@ jobs:
simulator:
name: simulator
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: github.repository == 'commaai/openpilot'
timeout-minutes: 45
steps:
@ -85,7 +85,7 @@ jobs:
notebooks:
name: notebooks
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: false && github.repository == 'commaai/openpilot'
timeout-minutes: 45
steps:

View File

@ -193,6 +193,7 @@ env = Environment(
"-Wno-c99-designator",
"-Wno-reorder-init-list",
"-Wno-error=unused-but-set-variable",
"-Wno-vla-cxx-extension",
] + cflags + ccflags,
CPPPATH=cpppath + [

View File

@ -81,7 +81,7 @@ function install_ubuntu_common_requirements() {
valgrind
}
# Install Ubuntu 22.04 LTS packages
# Install Ubuntu 24.04 LTS packages
function install_ubuntu_lts_latest_requirements() {
install_ubuntu_common_requirements
@ -108,10 +108,7 @@ function install_ubuntu_focal_requirements() {
if [ -f "/etc/os-release" ]; then
source /etc/os-release
case "$VERSION_CODENAME" in
"jammy")
install_ubuntu_lts_latest_requirements
;;
"kinetic")
"jammy" | "kinetic" | "noble")
install_ubuntu_lts_latest_requirements
;;
"focal")
@ -124,10 +121,10 @@ if [ -f "/etc/os-release" ]; then
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
exit 1
fi
if [ "$UBUNTU_CODENAME" = "jammy" ] || [ "$UBUNTU_CODENAME" = "kinetic" ]; then
install_ubuntu_lts_latest_requirements
else
if [ "$UBUNTU_CODENAME" = "focal" ]; then
install_ubuntu_focal_requirements
else
install_ubuntu_lts_latest_requirements
fi
esac
else