Updated the other github actions.

This commit is contained in:
Relintai 2024-11-14 00:39:38 +01:00
parent c5c71bd0de
commit 210287a1fe
2 changed files with 8 additions and 15 deletions

View File

@ -12,20 +12,13 @@ concurrency:
jobs: jobs:
android-editor: android-editor:
runs-on: "ubuntu-20.04" runs-on: "ubuntu-24.04"
name: Android Editor (target=release_debug, tools=yes) name: Android Editor (target=release_debug, tools=yes)
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
# Azure repositories are not reliable, we need to prevent azure giving us packages.
- name: Make apt sources.list use the default Ubuntu repositories
run: |
sudo rm -f /etc/apt/sources.list.d/*
sudo cp -f misc/ci/sources.list /etc/apt/sources.list
sudo apt-get update
- name: Set up Java 17 - name: Set up Java 17
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:

View File

@ -12,7 +12,7 @@ concurrency:
jobs: jobs:
build-server: build-server:
runs-on: "ubuntu-20.04" runs-on: "ubuntu-22.04"
name: ${{ matrix.name }} name: ${{ matrix.name }}
strategy: strategy:
fail-fast: false fail-fast: false
@ -36,14 +36,14 @@ jobs:
- name: Linux dependencies - name: Linux dependencies
shell: bash shell: bash
run: | run: |
# Azure repositories are not reliable, we need to prevent azure giving us packages. # Azure repositories are flaky, remove them.
sudo rm -f /etc/apt/sources.list.d/* sudo rm -f /etc/apt/sources.list.d/{azure,microsoft}*
sudo cp -f misc/ci/sources.list /etc/apt/sources.list
sudo apt-get update sudo apt-get update
# The actual dependencies # The actual dependencies
sudo apt-get install build-essential pkg-config libx11-dev libxcursor-dev \ sudo apt-get install --no-install-recommends build-essential pkg-config libx11-dev \
libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev \ libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev \
libdbus-1-dev libudev-dev libxi-dev libxrandr-dev yasm xvfb wget unzip libpulse-dev libdbus-1-dev libudev-dev libxi-dev libxrandr-dev yasm xvfb wget unzip \
libspeechd-dev speech-dispatcher
- name: Restore Pandemonium build cache - name: Restore Pandemonium build cache
uses: ./.github/actions/pandemonium-cache-restore uses: ./.github/actions/pandemonium-cache-restore