chore(ci): mac arm64 and universal binary support

.github/workflows/macos-qt6.yml

@@ -2,14 +2,14 @@ name: MacOS Qt6
 on:
   push:
     paths-ignore:
-      - 'README.md'
-      - 'LICENSE'
-      - 'BUILD.md'
+      - "README.md"
+      - "LICENSE"
+      - "BUILD.md"
   pull_request:
     paths-ignore:
-      - 'README.md'
-      - 'LICENSE'
-      - 'BUILD.md'
+      - "README.md"
+      - "LICENSE"
+      - "BUILD.md"
   release:
     types: [published]
 jobs:
@@ -20,6 +20,7 @@ jobs:
       matrix:
         os: [macos-latest]
         build_type: [Release, RelWithDebInfo]
+        arch: [x86_64, arm64, x86_64;arm64]
         qt_ver: [6.2.3]
         qt_arch: [clang_64]
     env:
@@ -45,7 +46,8 @@ jobs:
             -DLEMON_QT6=ON \
             -DLEMON_BUILD_INFO="Build for macOS" \
             -DLEMON_BUILD_EXTRA_INFO="Build on $(uname -sr)" \
-            -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
+            -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
+            -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" 
           cmake --build . --parallel $(sysctl -n hw.logicalcpu)
       # tag 打包
       - name: package
@@ -59,13 +61,13 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v2-preview
         with:
-          name: ${{ env.targetName }}-Qt${{ matrix.qt_ver }}-${{ matrix.build_type }}.dmg
+          name: ${{ env.targetName }}-Qt${{ matrix.qt_ver }}-${{ matrix.build_type }}-${{ matrix.arch }}.dmg
           path: ${{ env.targetName }}.dmg
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ./${{ env.targetName }}.dmg
-          asset_name: ${{ env.targetName }}-Qt${{ matrix.qt_ver }}-${{ matrix.build_type }}.dmg
+          asset_name: ${{ env.targetName }}-Qt${{ matrix.qt_ver }}-${{ matrix.build_type }}-${{ matrix.arch }}.dmg
           tag: ${{ github.ref }}

makespec/BUILDVERSION

@@ -1 +1 @@
-212
+213

src/compilersettings.cpp

@@ -68,6 +68,7 @@ auto CompilerSettings::checkValid() -> bool {
 		compilerNames.append(i->getCompilerName());
 	}
 
+	// n^2?
 	for (int i = 0; i < compilerList.size(); i++) {
 		if (compilerNames.count(compilerNames[i]) > 1) {
 			ui->compilerList->setFocus();

src/core/contest.cpp

@@ -169,8 +169,6 @@ void Contest::clearPath(const QString &curDir) {
 
 void Contest::judge(const QVector<std::pair<Contestant *, int>> &judgingTasks) {
 	stopJudging = false;
-	// emit contestantJudgingStart(contestant->getContestantName());
-
 	controller = new JudgingController(settings);
 
 	// connect(controller, &JudgingController::judgeFinished, this, &Contest::judgeFinished);
@@ -205,8 +203,6 @@ void Contest::judge(const QVector<std::pair<Contestant *, int>> &judgingTasks) {
 	delete eventLoop;
 	delete controller;
 	controller = nullptr;
-	/* emit contestantJudgedDisplay(contestant->getContestantName(), contestant->getTotalScore(),
-	                             getTotalScore()); */
 	emit contestantJudgingFinished();
 }