diff options
author | Andreas Buhr <andreas.buhr@qt.io> | 2021-11-10 09:09:51 +0100 |
---|---|---|
committer | Andreas Buhr <andreas.buhr@qt.io> | 2021-11-10 18:57:33 +0100 |
commit | 2d7900e2b1bf1eba3ade5241eaf21f913845cd4a (patch) | |
tree | e8829d60995edb18fedcf1f37fb29906a7e52b78 /.github | |
parent | 1cc9ac71ac1b433eba65e75413bca57380f0e6b9 (diff) |
Repair github action workflow
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>
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/ninja-build.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/ninja-build.yml b/.github/workflows/ninja-build.yml index 0b74aa7716..cdb6e7df10 100644 --- a/.github/workflows/ninja-build.yml +++ b/.github/workflows/ninja-build.yml @@ -38,7 +38,7 @@ jobs: # 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 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 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 @@ -65,7 +65,10 @@ jobs: - name: prepare 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 if: runner.os == 'macOS' run: echo noop @@ -124,7 +127,7 @@ jobs: run: mkdir build - name: configure 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 -prefix '${{ runner.temp }}'/install_dir ${{ matrix.configure_flags }}" |