Skip to content

Commit

Permalink
Updated the X11 release to Ubuntu 22.04 + Qt 5.15.12
Browse files Browse the repository at this point in the history
  • Loading branch information
mmatyas committed Jan 8, 2024
1 parent 86d3eed commit dcb9588
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/x11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@ on: [push, pull_request, workflow_dispatch]
env:
TOOLS_URL: https://github.com/mmatyas/pegasus-frontend/releases/download/alpha1
QT_TARGET: x11-static
QT_VERSION: qt51510
QT_VERSION_PRETTY: "5.15.10"
QT_VERSION: qt51512
QT_VERSION_PRETTY: "5.15.12"
SDL_TARGET: x11-bionic
SDL_VERSION: "2.0.20"


jobs:
x11:
runs-on: ubuntu-20.04
strategy:
matrix:
buildgen: [cmake, qmake, qmake-lcov]
runner: ['ubuntu-22.04']

runs-on: matrix.runner
steps:
- uses: actions/checkout@v3
with: {submodules: 'recursive', fetch-depth: 0, fetch-tags: true}
Expand All @@ -29,12 +31,10 @@ jobs:
ccache-x11-
ccache-
- name: GCC PPA
run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test
- name: APT deps
run: sudo apt-get update && sudo apt-get install -y
ccache
g++-10
g++
lcov
libasound-dev
libgl1-mesa-dev
Expand Down Expand Up @@ -74,9 +74,6 @@ jobs:

- name: Configure (cmake)
if: matrix.buildgen == 'cmake'
env:
CC: gcc-10
CXX: g++-10
run: cmake
-B build
-G Ninja
Expand Down

0 comments on commit dcb9588

Please sign in to comment.