From eb46bfb505bb9c19113a1b5ebabbbdc0184d69ec Mon Sep 17 00:00:00 2001 From: jchv Date: Mon, 4 Jul 2022 02:09:14 -0400 Subject: [PATCH 1/2] Fix macOS build architectures. Fixes #1. --- .github/workflows/build-macos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 1361b43..d665832 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -35,7 +35,7 @@ jobs: - name: Configure build working-directory: build run: | - ../source/qt-everywhere-src-${{ env.QT_VERSION }}/configure -prefix "../Qt-${{ env.QT_VERSION }}" -static -${{ matrix.debug_release }} -opensource -confirm-license -opengl desktop -qt-zlib -qt-libpng -qt-webp -qt-libjpeg -qt-freetype -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtsensors -skip qtspeech -skip qtsvg -skip qtwayland -skip qtwebglplugin -skip qtwebview -skip webengine -make libs -nomake tools -nomake examples -nomake tests + QMAKE_APPLE_DEVICE_ARCHS="${{ matrix.arch }} "../source/qt-everywhere-src-${{ env.QT_VERSION }}/configure -prefix "../Qt-${{ env.QT_VERSION }}" -static -${{ matrix.debug_release }} -opensource -confirm-license -opengl desktop -qt-zlib -qt-libpng -qt-webp -qt-libjpeg -qt-freetype -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtsensors -skip qtspeech -skip qtsvg -skip qtwayland -skip qtwebglplugin -skip qtwebview -skip webengine -make libs -nomake tools -nomake examples -nomake tests - name: Build Qt SDK working-directory: build run: make -j4 From 65163340f9f9d6a890da23925ca8fb5250f8de03 Mon Sep 17 00:00:00 2001 From: jchv Date: Mon, 4 Jul 2022 02:25:54 -0400 Subject: [PATCH 2/2] Fix fat finger. --- .github/workflows/build-macos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index d665832..acb57ee 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -35,7 +35,7 @@ jobs: - name: Configure build working-directory: build run: | - QMAKE_APPLE_DEVICE_ARCHS="${{ matrix.arch }} "../source/qt-everywhere-src-${{ env.QT_VERSION }}/configure -prefix "../Qt-${{ env.QT_VERSION }}" -static -${{ matrix.debug_release }} -opensource -confirm-license -opengl desktop -qt-zlib -qt-libpng -qt-webp -qt-libjpeg -qt-freetype -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtsensors -skip qtspeech -skip qtsvg -skip qtwayland -skip qtwebglplugin -skip qtwebview -skip webengine -make libs -nomake tools -nomake examples -nomake tests + QMAKE_APPLE_DEVICE_ARCHS="${{ matrix.arch }}" ../source/qt-everywhere-src-${{ env.QT_VERSION }}/configure -prefix "../Qt-${{ env.QT_VERSION }}" -static -${{ matrix.debug_release }} -opensource -confirm-license -opengl desktop -qt-zlib -qt-libpng -qt-webp -qt-libjpeg -qt-freetype -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtsensors -skip qtspeech -skip qtsvg -skip qtwayland -skip qtwebglplugin -skip qtwebview -skip webengine -make libs -nomake tools -nomake examples -nomake tests - name: Build Qt SDK working-directory: build run: make -j4