diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-11-12 13:46:08 -0500 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-11-12 13:46:59 -0500 |
| commit | 3a73c6ebd18bff0fa125be58d3ac9c7a63bab61d (patch) | |
| tree | c7341bd56c977259578b127886c9a88eeef11820 /.github | |
| parent | 5094c2a5f7d506b0e685120f14d1df42e1e9d495 (diff) | |
| parent | cb411fa960f0b7fdbd97dcdb4c90f9346360ee0e (diff) | |
| download | redot-engine-3a73c6ebd18bff0fa125be58d3ac9c7a63bab61d.tar.gz | |
Merge commit godotengine/godot@cb411fa960f0b7fdbd97dcdb4c90f9346360ee0e
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/android_builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/godot_cpp_test.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux_builds.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/static_checks.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/web_builds.yml | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml index d516c37d16..950e1e51cc 100644 --- a/.github/workflows/android_builds.yml +++ b/.github/workflows/android_builds.yml @@ -14,7 +14,7 @@ concurrency: jobs: build-android: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: ${{ matrix.name }} strategy: fail-fast: false diff --git a/.github/workflows/godot_cpp_test.yml b/.github/workflows/godot_cpp_test.yml index e26c109d75..dc82a7cb3c 100644 --- a/.github/workflows/godot_cpp_test.yml +++ b/.github/workflows/godot_cpp_test.yml @@ -15,7 +15,7 @@ concurrency: jobs: godot-cpp-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: Build and test Godot CPP steps: - name: Checkout diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index 911c377c50..ffd39c866f 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -17,7 +17,8 @@ concurrency: jobs: build-linux: - runs-on: ubuntu-20.04 + # If unspecified, stay one LTS before latest to increase portability of Linux artifacts. + runs-on: ${{ matrix.os || 'ubuntu-22.04' }} name: ${{ matrix.name }} strategy: fail-fast: false @@ -60,6 +61,8 @@ jobs: artifact: false # Test our oldest supported SCons/Python versions on one arbitrary editor build. legacy-scons: true + # Python 3.6 unavailable on 22.04. + os: ubuntu-20.04 - name: Editor with ThreadSanitizer (target=editor, tests=yes, dev_build=yes, use_tsan=yes, use_llvm=yes, linker=lld) cache-name: linux-editor-thread-sanitizer @@ -100,7 +103,7 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EB8B81E14DA65431D7504EA8F63F0F2B90935439 - sudo add-apt-repository "deb https://ppa.launchpadcontent.net/kisak/turtle/ubuntu focal main" + sudo add-apt-repository "deb https://ppa.launchpadcontent.net/kisak/turtle/ubuntu ${{ matrix.os == 'ubuntu-20.04' && 'focal' || 'jammy' }} main" sudo apt-get install -qq mesa-vulkan-drivers # TODO: Figure out somehow how to embed this one. diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml index ff102a06cc..9b326cb43e 100644 --- a/.github/workflows/static_checks.yml +++ b/.github/workflows/static_checks.yml @@ -9,7 +9,7 @@ concurrency: jobs: static-checks: name: Code style, file formatting, and docs - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml index ec57fa2f0d..9ed8475769 100644 --- a/.github/workflows/web_builds.yml +++ b/.github/workflows/web_builds.yml @@ -15,7 +15,7 @@ concurrency: jobs: web-template: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 name: ${{ matrix.name }} strategy: fail-fast: false |