Fix macOS building with qt6 by default (#2500)

This commit is contained in:
pajlada
2021-03-06 14:05:03 +01:00
committed by GitHub
parent b2aa370015
commit 346cd2b86d
2 changed files with 8 additions and 17 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
echo "Running MACDEPLOYQT" echo "Running MACDEPLOYQT"
/usr/local/opt/qt/bin/macdeployqt chatterino.app $Qt5_DIR/bin/macdeployqt chatterino.app
echo "Creating python3 virtual environment" echo "Creating python3 virtual environment"
python3 -m venv venv python3 -m venv venv
echo "Entering python3 virtual environment" echo "Entering python3 virtual environment"
+7 -16
View File
@@ -19,7 +19,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [windows-latest, ubuntu-latest, macos-latest] os: [windows-latest, ubuntu-latest, macos-latest]
qt-version: [default, 5.12.10] qt-version: [5.15.2, 5.12.10]
fail-fast: false fail-fast: false
steps: steps:
@@ -39,17 +39,8 @@ jobs:
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
run: sudo apt-get update && sudo apt-get -y install p7zip-full run: sudo apt-get update && sudo apt-get -y install p7zip-full
- name: Install Qt (Default version) - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
if: ${{ matrix.qt-version == 'default' }}
with:
aqtversion: '==1.1.1'
cached: ${{ steps.cache-qt.outputs.cache-hit }}
extra: --external 7z
- name: Install Qt (Specific version)
uses: jurplel/install-qt-action@v2
if: ${{ matrix.qt-version != 'default' }}
with: with:
aqtversion: '==1.1.1' aqtversion: '==1.1.1'
cached: ${{ steps.cache-qt.outputs.cache-hit }} cached: ${{ steps.cache-qt.outputs.cache-hit }}
@@ -150,7 +141,7 @@ jobs:
- name: Install dependencies (MacOS) - name: Install dependencies (MacOS)
if: startsWith(matrix.os, 'macos') if: startsWith(matrix.os, 'macos')
run: | run: |
brew install boost openssl rapidjson qt p7zip create-dmg brew install boost openssl rapidjson p7zip create-dmg
shell: bash shell: bash
- name: Build (MacOS) - name: Build (MacOS)
@@ -158,7 +149,7 @@ jobs:
run: | run: |
mkdir build mkdir build
cd build cd build
/usr/local/opt/qt/bin/qmake .. DEFINES+=$dateOfBuild $Qt5_DIR/bin/qmake .. DEFINES+=$dateOfBuild
make -j8 make -j8
shell: bash shell: bash
@@ -200,17 +191,17 @@ jobs:
- uses: actions/download-artifact@v2.0.8 - uses: actions/download-artifact@v2.0.8
with: with:
name: chatterino-windows-x86-64-default.zip name: chatterino-windows-x86-64-5.15.2.zip
path: windows/ path: windows/
- uses: actions/download-artifact@v2.0.8 - uses: actions/download-artifact@v2.0.8
with: with:
name: Chatterino-x86_64-default.AppImage name: Chatterino-x86_64-5.15.2.AppImage
path: linux/ path: linux/
- uses: actions/download-artifact@v2.0.8 - uses: actions/download-artifact@v2.0.8
with: with:
name: chatterino-osx-default.dmg name: chatterino-osx-5.15.2.dmg
path: macos/ path: macos/
# TODO: Extract dmg and appimage # TODO: Extract dmg and appimage