diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2020-09-08 14:03:15 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-09-11 13:37:48 +0200 |
| commit | e6b8eb502eb39f27fe3aa7a675cb3ca3ad220672 (patch) | |
| tree | 284d7ff1a50f3652c2b89b3de4ad0ee5ce399e6c /.github/workflows | |
| parent | 549b7053a2dd4e5caf417b0e8898f9eb73686d33 (diff) | |
| download | qtbase-e6b8eb502eb39f27fe3aa7a675cb3ca3ad220672.tar.gz | |
GitHub Actions: Fix workflow file
-no-iconv configure parameter was removed and various changes to the
configure parameters.
Change-Id: I8716388b20846cdd1ba63a715308813a312dea65
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/ninja-build.yml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/.github/workflows/ninja-build.yml b/.github/workflows/ninja-build.yml index 776e6c75c5..22ac8ae6ff 100644 --- a/.github/workflows/ninja-build.yml +++ b/.github/workflows/ninja-build.yml @@ -27,14 +27,14 @@ jobs: deps: libgl-dev libglu-dev libpcre2-dev libz-dev libfreetype6-dev libpng-dev libjpeg-dev libsqlite3-dev tools: ninja-build ccache install_cmd: sudo apt-get -y install - configure_flags: -system_sqlite + configure_flags: -system-sqlite -system-pcre -system-zlib -system-freetype -system-libpng -system-libjpeg - name: macos-10.15 os: macos-10.15 deps: jpeg sqlite tools: ninja ccache pkg-config install_cmd: brew install # Specifically on macOS pkg_config has to be manually turned on otherwise libraries under /usr/local are not detected. - configure_flags: -system_sqlite -feature pkg_config + configure_flags: -feature-pkg-config -system-sqlite -system-libjpeg - name: windows-2019 os: windows-2019 install_cmd: choco install @@ -42,8 +42,8 @@ jobs: # Chocolatey sqlite package does not come with headers, so we build with bundled sqlite. #deps: sqlite tools: ninja ccache - # Because of header conflicts we disable everything else besides sqlite driver - configure_flags: -qt-sqlite -no-feature sql_psql -no-feature sql_mysql -no-feature sql_odbc + # We don't want the system headers / libraries from Strawberry Perl while compiling with MinGW 8.1.0 + configure_flags: -qt-sqlite -qt-pcre -qt-zlib -qt-freetype -qt-libpng -qt-libjpeg -no-feature-sql-psql -no-feature-sql-mysql -no-feature-sql-odbc runs-on: ${{ matrix.os }} @@ -97,8 +97,7 @@ jobs: working-directory: build run: ../configure -cmake -opensource -confirm-license -ccache -no-pch \ \ -debug -nomake tests -nomake examples \ - \ -qt-harfbuzz -no-iconv \ - \ -system-pcre -system-zlib -system-freetype -system-libpng -system-libjpeg \ + \ -qt-harfbuzz \ \ ${{ matrix.configure_flags }} - name: ninja working-directory: build |