AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repair github action workflow

Browse Source 
There is a github action configuration in qtbase, which is,
however, hardly maintained. In its current form it is broken.
This patch repairs it.

Change-Id: I075fa79157c4240cd550a90a86977e8ecf808cc8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Andreas Buhr 2021-11-10 09:09:51 +01:00
parent 1cc9ac71ac
commit 2d7900e2b1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/ninja-build.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
# NOTE: system libb2 is not detected because version < 0.98.1 lacks pkg-config module # NOTE: system libb2 is not detected because version < 0.98.1 lacks pkg-config module
# NOTE: system libharfbuzz is not detected because system has old version # NOTE: system libharfbuzz is not detected because system has old version
deps: libgl-dev libglu-dev 'libxcb*-dev' libx11-xcb-dev libxkbcommon-x11-dev libpcre2-dev libz-dev libfreetype6-dev libpng-dev libjpeg-dev libsqlite3-dev libharfbuzz-dev libb2-dev libdouble-conversion-dev deps: libgl-dev libglu-dev 'libxcb*-dev' libx11-xcb-dev libxkbcommon-x11-dev libpcre2-dev libz-dev libfreetype6-dev libpng-dev libjpeg-dev libsqlite3-dev libharfbuzz-dev libb2-dev libdouble-conversion-dev
tools: ninja-build ccache tools: ninja-build ccache gcc-10
install_cmd: sudo apt-get -y install install_cmd: sudo apt-get -y install
configure_flags: -xcb -system-sqlite -system-pcre -system-zlib -system-freetype -system-libpng -system-libjpeg -system-harfbuzz -system-libb2 -system-doubleconversion configure_flags: -xcb -system-sqlite -system-pcre -system-zlib -system-freetype -system-libpng -system-libjpeg -system-harfbuzz -system-libb2 -system-doubleconversion
- name: macos-10.15 - name: macos-10.15
@ -65,7 +65,10 @@ jobs:
- name: prepare Linux - name: prepare Linux
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: sudo apt-get update run: |
sudo apt-get update
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100
- name: prepare macOS - name: prepare macOS
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: echo noop run: echo noop
@ -124,7 +127,7 @@ jobs:
run: mkdir build run: mkdir build
- name: configure - name: configure
working-directory: build working-directory: build
run: "../source/configure -cmake -opensource -confirm-license -ccache -no-pch run: "../source/configure -opensource -confirm-license -ccache -no-pch
-debug -nomake tests -nomake examples -debug -nomake tests -nomake examples
-prefix '${{ runner.temp }}'/install_dir -prefix '${{ runner.temp }}'/install_dir
${{ matrix.configure_flags }}" ${{ matrix.configure_flags }}"