Merge pull request #1468 from TomHarte/Qt6CI

Reinstate Xcode CI.
TomHarte · Feb 4, 2025 · fd09f06 · fd09f06
2 parents 318b61b + d66b501
commit fd09f06
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,18 +1,24 @@
 name: Build
 on: [pull_request]
 jobs:
-#  build-mac-xcodebuild:
-#    name: Mac UI / xcodebuild / ${{ matrix.os }}
-#    strategy:
-#      matrix:
-#        os: [macos-13, macos-14, macos-15]
-#    runs-on: ${{ matrix.os }}
-#    steps:
-#    - name: Checkout
-#      uses: actions/checkout@v4
-#    - name: Make
-#      working-directory: OSBindings/Mac
-#      run: xcodebuild CODE_SIGN_IDENTITY=-
+
+  build-mac-xcodebuild:
+    name: Mac UI / xcodebuild / ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest] #[macos-13, macos-14, macos-15]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Install Xcode
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
+    - name: Make
+      working-directory: OSBindings/Mac
+      run: xcodebuild CODE_SIGN_IDENTITY=-
+
   build-sdl-cmake:
     name: SDL UI / cmake / ${{ matrix.os }}
     strategy:
@@ -49,6 +55,7 @@ jobs:
         esac
         cmake -S. -Bbuild -DCLK_UI=SDL -DCMAKE_BUILD_TYPE=Release
         cmake --build build -v -j"$jobs"
+
   build-sdl-scons:
     name: SDL UI / scons / ${{ matrix.os }}
     strategy:
@@ -85,8 +92,9 @@ jobs:
             jobs=1
         esac
         scons -j"$jobs"
-  build-qt:
-    name: Qt / ${{ matrix.os }}
+
+  build-qt5:
+    name: Qt 5 / ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest]
@@ -105,3 +113,24 @@ jobs:
       run: |
         qmake -o Makefile clksignal.pro
         make
+
+#  build-qt6:
+#    name: Qt 6 / ${{ matrix.os }}
+#    strategy:
+#      matrix:
+#        os: [ubuntu-latest]
+#    runs-on: ${{ matrix.os }}
+#    steps:
+#    - name: Checkout
+#      uses: actions/checkout@v4
+#    - name: Install dependencies
+#      uses: jurplel/install-qt-action@v4
+#      with:
+#        version: '6.8'
+#        archives: qtbase
+#    - name: Make
+#      working-directory: OSBindings/Qt
+#      shell: bash
+#      run: |
+#        qmake -o Makefile clksignal.pro
+#        make
diff --git a/Processors/6502Esque/Implementation/LazyFlags.hpp b/Processors/6502Esque/Implementation/LazyFlags.hpp
@@ -62,7 +62,9 @@ struct LazyFlags {
 	}
 
 	uint8_t get() const {
-		return carry | overflow | (inverse_interrupt ^ Flag::Interrupt) | (negative_result & 0x80) | (zero_result ? 0 : Flag::Zero) | Flag::Always | Flag::Break | decimal;
+		return
+			carry | overflow | (inverse_interrupt ^ Flag::Interrupt) | (negative_result & 0x80) |
+			(zero_result ? 0 : Flag::Zero) | Flag::Always | Flag::Break | decimal;
 	}
 
 	LazyFlags() {