diff --git a/.github/workflows/build_qt.yml b/.github/workflows/build_qt.yml index a1f6d2da9..7a5a8d3ed 100644 --- a/.github/workflows/build_qt.yml +++ b/.github/workflows/build_qt.yml @@ -62,10 +62,6 @@ jobs: exit 1 } - - # - name: Display Opt Directories - # run: cat opt_dirs.txt - # Use Ninja 1.11.1 because Qt need to be patched for Ninja 1.12.1. - name: Install Ninja 1.11.1 run: | @@ -98,29 +94,62 @@ jobs: - name: Download Qt ${{ matrix.qt-version }} source run: | - git clone git://code.qt.io/qt/qt5.git - cd qt5 - git checkout 5.15 - ./init-repository + curl https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/official_releases/qt/5.15/5.15.15/single/qt-everywhere-opensource-src-5.15.15.tar.xz -o qt.tar.xz + tar xf qt.tar.xz + mv qt-everywhere-src-5.15.15 qt-src - name: Create directory for build run: | mkdir -p qt-build + mkdir -p qt-release - name: Configure Qt ${{ matrix.qt-version }} run: | - ../qt5/configure -release -prefix ./release -nomake examples -nomake tests QMAKE_APPLE_DEVICE_ARCHS=arm64 \ - -opensource -confirm-license -c++std c++17 -openssl-linked -opengl desktop -release -skip qtlocation \ - -I /opt/homebrew/Cellar/openssl@1.1/1.1.1w/include -L //opt/homebrew/Cellar/openssl@1.1/1.1.1w/lib - env: - OPENSSL_LIBS: '-L/opt/homebrew/Cellar/openssl@1.1/1.1.1w/lib -lssl -lcrypto' + ../qt-src/configure \ + --prefix="../qt-release" \ + -no-strip \ + -no-rpath \ + -opensource \ + -plugin-sql-sqlite \ + -openssl \ + -verbose \ + -opengl desktop \ + -no-warnings-are-errors \ + -no-libudev \ + -no-egl \ + -nomake examples \ + -nomake tests \ + -c++std c++14\ + -confirm-license \ + -no-use-gold-linker \ + -release \ + -no-sql-mysql \ + -no-xcb \ + -qt-libjpeg \ + -qt-libpng \ + -bundled-xcb-xinput \ + -sysconfdir /etc/xdg \ + -qt-pcre \ + -qt-harfbuzz \ + -R . \ + -icu \ + -skip qtnetworkauth \ + -skip qtpurchasing \ + -skip qtlocation \ + -I /opt/homebrew/Cellar/openssl@1.1/1.1.1w/include -L /opt/homebrew/Cellar/openssl@1.1/1.1.1w/lib \ + -I /opt/homebrew/Cellar/icu4c/74.2/include -L /opt/homebrew/Cellar/icu4c/74.2/lib working-directory: ${{ github.workspace }}/qt-build - - name: Build Qt + - name: Build Qt ${{ matrix.qt-version }} run: | make -j$(python -c 'import os; print(os.cpu_count())') working-directory: ${{ github.workspace }}/qt-build + - name: Install Qt ${{ matrix.qt-version }} + run: | + make install -j$(python -c 'import os; print(os.cpu_count())') + working-directory: ${{ github.workspace }}/qt-build + - name: Display release folder run: | ls -al ./release