1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GitHub Actions: Fix workflow file

Browse Source 
-no-iconv configure parameter was removed and various changes to the
configure parameters.

Change-Id: I8716388b20846cdd1ba63a715308813a312dea65
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Cristian Adam 2020-09-08 14:03:15 +02:00
parent 549b7053a2
commit e6b8eb502e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,14 +27,14 @@ jobs:
deps: libgl-dev libglu-dev libpcre2-dev libz-dev libfreetype6-dev libpng-dev libjpeg-dev libsqlite3-dev deps: libgl-dev libglu-dev libpcre2-dev libz-dev libfreetype6-dev libpng-dev libjpeg-dev libsqlite3-dev
tools: ninja-build ccache tools: ninja-build ccache
install_cmd: sudo apt-get -y install 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 - name: macos-10.15
os: macos-10.15 os: macos-10.15
deps: jpeg sqlite deps: jpeg sqlite
tools: ninja ccache pkg-config tools: ninja ccache pkg-config
install_cmd: brew install install_cmd: brew install
# Specifically on macOS pkg_config has to be manually turned on otherwise libraries under /usr/local are not detected. # 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 - name: windows-2019
os: windows-2019 os: windows-2019
install_cmd: choco install install_cmd: choco install
@ -42,8 +42,8 @@ jobs:
# Chocolatey sqlite package does not come with headers, so we build with bundled sqlite. # Chocolatey sqlite package does not come with headers, so we build with bundled sqlite.
#deps: sqlite #deps: sqlite
tools: ninja ccache tools: ninja ccache
# Because of header conflicts we disable everything else besides sqlite driver # We don't want the system headers / libraries from Strawberry Perl while compiling with MinGW 8.1.0
configure_flags: -qt-sqlite -no-feature sql_psql -no-feature sql_mysql -no-feature sql_odbc 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 }} runs-on: ${{ matrix.os }}
@ -97,8 +97,7 @@ jobs:
working-directory: build working-directory: build
run: ../configure -cmake -opensource -confirm-license -ccache -no-pch \ run: ../configure -cmake -opensource -confirm-license -ccache -no-pch \
\ -debug -nomake tests -nomake examples \ \ -debug -nomake tests -nomake examples \
\ -qt-harfbuzz -no-iconv \ \ -qt-harfbuzz \
\ -system-pcre -system-zlib -system-freetype -system-libpng -system-libjpeg \
\ ${{ matrix.configure_flags }} \ ${{ matrix.configure_flags }}
- name: ninja - name: ninja
working-directory: build working-directory: build