Add macOS/arm64 (#4)

Author: thestr4ng3r

.github/workflows/package-build.yml

@@ -16,7 +16,25 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2016, macos-latest, ubuntu-16.04]
+        name: [
+          linux-x86_64,
+          macos-x86_64,
+          macos-arm64,
+          windows-x86_64
+        ]
+        include:
+          - name: linux-x86_64
+            os: ubuntu-16.04
+            arch: x86_64
+          - name: macos-x86_64
+            os: macos-10.15
+            arch: x86_64
+          - name: macos-arm64
+            os: macos-11
+            arch: arm64
+          - name: windows-x86_64
+            os: windows-2016
+            arch: x86_64
       fail-fast: false
     steps:
     - uses: actions/checkout@v2
@@ -25,21 +43,21 @@ jobs:
       shell: powershell
       run: |
         ./build_windows.ps1
-        echo "UPLOAD_FILE=cutter-deps-qt-win.tar.gz" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        echo "UPLOAD_FILE=cutter-deps-qt-win-${{ matrix.arch }}.tar.gz" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         echo "UPLOAD_ASSET_TYPE=application/gzip" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     - name: build macos
       if: contains(matrix.os, 'macos')
       run: |
         xcode-select --print-path
-        make
-        echo UPLOAD_FILE=cutter-deps-qt-macos.tar.gz >> $GITHUB_ENV
+        make ARCH=${{ matrix.arch }}
+        echo UPLOAD_FILE=cutter-deps-qt-macos-${{ matrix.arch }}.tar.gz >> $GITHUB_ENV
         echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV
     - name: build linux
       if: contains(matrix.os, 'ubuntu')
       run: |
         sudo apt-get install libxcb1-dev libxkbcommon-dev libxkbcommon-x11-dev libgtk-3-dev libgl1-mesa-dev libglu1-mesa-dev libxcb-*-dev
-        make
-        echo UPLOAD_FILE=cutter-deps-qt-linux.tar.gz >> $GITHUB_ENV
+        make ARCH=${{ matrix.arch }}
+        echo UPLOAD_FILE=cutter-deps-qt-linux-${{ matrix.arch }}.tar.gz >> $GITHUB_ENV
         echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV
     - uses: actions/upload-artifact@v2
       if: startsWith(github.event.ref, 'refs/tags') == false
@@ -62,4 +80,4 @@ jobs:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
           asset_path: ${{ env.UPLOAD_FILE }}
           asset_name: ${{ env.UPLOAD_FILE }}
-          asset_content_type: ${{ env.UPLOAD_ASSET_TYPE }}
+          asset_content_type: ${{ env.UPLOAD_ASSET_TYPE }}

.gitignore

@@ -3,3 +3,4 @@
 /jom
 *~
 *.swp
+/cutter-deps-*.tar.gz

Makefile

@@ -17,14 +17,21 @@ ifeq ($(filter ${PLATFORM},${PLATFORMS_SUPPORTED}),)
   ${error Platform not detected or unsupported.}
 endif
 
+ARCH:=x86_64
+
+#BASE_URL=https://qt-mirror.dannhauer.de
+#BASE_URL=https://ftp.fau.de/qtproject
+#BASE_URL=http://www.mirrorservice.org/sites/download.qt-project.org
+BASE_URL=https://download.qt.io
+
 ifeq (${PLATFORM},win)
 QT_SRC_FILE=qt-everywhere-src-5.15.2.zip
 QT_SRC_MD5=40fc0bda97fbcc1eff8ab905ce2b0300
-QT_SRC_URL=https://download.qt.io/official_releases/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.zip
+QT_SRC_URL=${BASE_URL}/official_releases/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.zip
 else
 QT_SRC_FILE=qt-everywhere-src-5.15.2.tar.xz
 QT_SRC_MD5=e1447db4f06c841d8947f0a6ce83a7b5
-QT_SRC_URL=https://download.qt.io/official_releases/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz
+QT_SRC_URL=${BASE_URL}/official_releases/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz
 endif
 
 QT_SRC_DIR=qt-everywhere-src-5.15.2
@@ -41,7 +48,7 @@ PLATFORM_QT_OPTIONS=-xcb -gtk -linker gold
 endif
 ifeq (${PLATFORM},macos)
 PLATFORM_QT_CONFIGURE=configure
-PLATFORM_QT_OPTIONS=-dbus-runtime
+PLATFORM_QT_OPTIONS=-dbus-runtime -device-option QMAKE_APPLE_DEVICE_ARCHS=${ARCH}
 endif
 ifeq (${PLATFORM},win)
 PLATFORM_QT_CONFIGURE=configure.bat
@@ -50,7 +57,7 @@ endif
 
 BUILD_THREADS:=4
 
-PACKAGE_FILE=cutter-deps-qt-${PLATFORM}.tar.gz
+PACKAGE_FILE=cutter-deps-qt-${PLATFORM}-${ARCH}.tar.gz
 
 all: qt pkg
 

build_windows.ps1

@@ -78,7 +78,7 @@ $QT_SRC_DIR = "qt-everywhere-src-$version_full"
 $qt_build_dir = "$QT_SRC_DIR/build"
 $QT_PREFIX = "$PSScriptRoot/qt"
 $BUILD_THREADS = 3
-$PACKAGE_FILE = "cutter-deps-qt-win.tar.gz"
+$PACKAGE_FILE = "cutter-deps-qt-win-x86_64.tar.gz"
 
 
 # https://download.qt.io/official_releases/jom/jom.zip