Skip to content

Commit

Permalink
build: Bump Ubuntu to 24.04 (#5384)
Browse files Browse the repository at this point in the history
* Update pip scripts

* Bump Ubuntu to 24.04

Just because Ubuntu says it's LTS doesn't mean we have to treat it as such.

* Bump clang-tidy too

* build: bump all ubuntu runner to 24.04

* De-bump clang tidy

LLVM 12 doesn't exist for 24.04, so this can't get bumped until LLVM 16 migration or Ubuntu decides to make LLVM 12 for 24.04

* ci: downgrade clang-tidy ubuntu version

needs this workaround till ours is bumped

---------

Co-authored-by: scarf <[email protected]>
  • Loading branch information
RobbieNeko and scarf005 authored Sep 20, 2024
1 parent fbbbb41 commit 15924f9
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:
jobs:
build_catatclysm:
name: Build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: github.event.pull_request.draft == false

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:

jobs:
autofix:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
contents: write

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ permissions:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
environment: github-pages
steps:
- name: Checkout your repository using git
Expand All @@ -35,7 +35,7 @@ jobs:

deploy:
needs: build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/i18n-extraction.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:

jobs:
check-extraction:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/i18n-printf-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
check-po-printf:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: "Install dependencies"
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: pull_request_target

jobs:
triage:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

permissions:
contents: read
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/manual-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
jobs:
release:
name: Create Release
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
release_already_exists: ${{ steps.tag_check.outputs.exists }}
Expand Down Expand Up @@ -89,26 +89,26 @@ jobs:
mxe: x86_64
mxe_apt: x86-64
artifact: windows-tiles-x64
os: ubuntu-22.04
os: ubuntu-24.04
ext: zip
content: application/zip
- name: Windows Tiles x32
mxe: i686
mxe_apt: i686
artifact: windows-tiles-x32
os: ubuntu-22.04
os: ubuntu-24.04
ext: zip
content: application/zip
- name: Linux Tiles x64
os: ubuntu-22.04
os: ubuntu-24.04
mxe: none
android: none
tiles: 1
artifact: linux-tiles-x64
ext: tar.gz
content: application/gzip
- name: linux-curses-x64
os: ubuntu-22.04
os: ubuntu-24.04
mxe: none
android: none
tiles: 0
Expand Down Expand Up @@ -144,21 +144,21 @@ jobs:
ext: dmg
content: application/x-apple-diskimage
- name: Android x64
os: ubuntu-22.04
os: ubuntu-24.04
mxe: none
android: arm64
artifact: android-x64
ext: apk
content: application/apk
- name: Android x32
os: ubuntu-22.04
os: ubuntu-24.04
mxe: none
android: arm32
artifact: android-x32
ext: apk
content: application/apk
- name: Android Bundle
os: ubuntu-22.04
os: ubuntu-24.04
mxe: none
android: bundle
artifact: android-bundle
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:
jobs:
skip-duplicates:
continue-on-error: true
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
should_skip_code: ${{ steps.skip_code_check.outputs.should_skip }}
should_skip_data: ${{ steps.skip_data_check.outputs.should_skip }}
Expand All @@ -42,7 +42,7 @@ jobs:
include:
- title: GCC 12, Ubuntu, Curses
compiler: g++-12
os: ubuntu-22.04
os: ubuntu-24.04
cmake: 0
tiles: 0
sound: 0
Expand All @@ -56,7 +56,7 @@ jobs:

- title: GCC 12, Ubuntu, Tiles, Sound, Lua, CMake, Languages
compiler: g++-12
os: ubuntu-22.04
os: ubuntu-24.04
cmake: 1
tiles: 1
sound: 1
Expand All @@ -69,7 +69,7 @@ jobs:

- title: GCC 12, Ubuntu, Tiles, Sound, Lua
compiler: g++-12
os: ubuntu-22.04
os: ubuntu-24.04
cmake: 1
tiles: 1
sound: 1
Expand All @@ -83,7 +83,7 @@ jobs:
# === Temporarily disabled because of #3664 ===
# - title: GCC 12, Ubuntu, Tiles, NoSound, ASan
# compiler: g++-12
# os: ubuntu-22.04
# os: ubuntu-24.04
# cmake: 0
# tiles: 1
# sound: 0
Expand All @@ -96,7 +96,7 @@ jobs:
# === Temporarily disabled because of #3664 ===
# - title: Clang 14, Ubuntu, Tiles, NoSound, ASan, UBSan
# compiler: clang++-14
# os: ubuntu-22.04
# os: ubuntu-24.04
# cmake: 0
# tiles: 1
# sound: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-translation-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
push-template:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: >
${{ github.event.workflow_run.event == 'push' &&
github.event.workflow_run.conclusion == 'success' &&
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
release:
needs: metadata
name: Create Release
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

if: github.event_name == 'workflow_dispatch' || fromJson(needs.metadata.outputs.count) > 0
outputs:
Expand Down Expand Up @@ -114,26 +114,26 @@ jobs:
mxe: x86_64
mxe_apt: x86-64
artifact: windows-tiles-x64
os: ubuntu-22.04
os: ubuntu-24.04
ext: zip
content: application/zip
- name: Windows Tiles x32
mxe: i686
mxe_apt: i686
artifact: windows-tiles-x32
os: ubuntu-22.04
os: ubuntu-24.04
ext: zip
content: application/zip
- name: Linux Tiles x64
os: ubuntu-22.04
os: ubuntu-24.04
mxe: none
android: none
tiles: 1
artifact: linux-tiles-x64
ext: tar.gz
content: application/gzip
- name: linux-curses-x64
os: ubuntu-22.04
os: ubuntu-24.04
mxe: none
android: none
tiles: 0
Expand Down Expand Up @@ -169,21 +169,21 @@ jobs:
ext: dmg
content: application/x-apple-diskimage
- name: Android x64
os: ubuntu-22.04
os: ubuntu-24.04
mxe: none
android: arm64
artifact: android-x64
ext: apk
content: application/apk
- name: Android x32
os: ubuntu-22.04
os: ubuntu-24.04
mxe: none
android: arm32
artifact: android-x32
ext: apk
content: application/apk
- name: Android Bundle
os: ubuntu-22.04
os: ubuntu-24.04
mxe: none
android: bundle
artifact: android-bundle
Expand Down
12 changes: 9 additions & 3 deletions build-scripts/requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,19 @@ if [[ "$LIBBACKTRACE" == "1" ]]; then
)
fi

# needed for newer ubuntu versions
# https://stackoverflow.com/questions/75608323/how-do-i-solve-error-externally-managed-environment-every-time-i-use-pip-3
if [[ $(bc <<< "$(lsb_release -rs) > 22.04") -eq 1 ]]; then
PIP_FLAGS="--break-system-packages"
fi

if [ -n "$CATA_CLANG_TIDY" ]; then
pip install --user wheel --upgrade
pip install --user 'lit==0.11.1' 'click==7.1.2'
pip install --user wheel --upgrade $PIP_FLAGS
pip install --user 'lit==0.11.1' 'click==7.1.2' $PIP_FLAGS
fi

if [ -n "$LANGUAGES" ]; then
pip install --user polib luaparser
pip install --user polib luaparser $PIP_FLAGS
fi

# Influenced by https://github.com/zer0main/battleship/blob/master/build/windows/requirements.sh
Expand Down

0 comments on commit 15924f9

Please sign in to comment.