- CI: comment out CodeQL for now, as its not working well on macos-14…

… and I need 14 for Xcode 15

- CI: update jazzy to use macos-14 + ios 17
- CI: clean up file indentation

.github/workflows/docs-and-deploy.yml

@@ -5,7 +5,7 @@ on:
       - main
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-14
 
     steps:
       - uses: actions/[email protected]

.github/workflows/unit-test.yml

@@ -4,7 +4,6 @@ on:
     branches:
       - main
       - develop
-      - feature/update_estimation
   pull_request:
     branches:
       - main
@@ -27,11 +26,6 @@ jobs:
 
 
 
-
-
-
-
-
       # # Temporary step due to Xcode 15 / Github actions runner issues
       # - name: Install iOS 16 simulator for Xcode 15
       #   run: |
@@ -41,99 +35,48 @@ jobs:
 
       #     # Create an iOS 16.4 simulator
       #     xcrun simctl create "iPhone 14 Pro (16.4)" "com.apple.CoreSimulator.SimDeviceType.iPhone-14-Pro" "com.apple.CoreSimulator.SimRuntime.iOS-16-4"
+
 
 
-    #  - name: Install yeetd
-    #    run: |
-    #      wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg
-    #      sudo installer -pkg yeetd-normal.pkg -target /
-    #      yeetd &
-
-
-
-
-
+      # - name: Install yeetd
+      #   run: |
+      #     wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg
+      #     sudo installer -pkg yeetd-normal.pkg -target /
+      #     yeetd &
 
 
 
 
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: "swift"
+      # - name: Initialize CodeQL
+      #   uses: github/codeql-action/init@v3
+      #   with:
+      #     languages: "swift"
 
-
 
 
+      # - name: Launch simulator
+      #   run: open -a Simulator --args -CurrentDeviceUDID $(xcrun simctl list --json | ruby -e "require 'json'; puts JSON.parse(ARGF.read)['devices']['com.apple.CoreSimulator.SimRuntime.iOS-17-0'].find { |s| s['name'] == 'iPhone 15' }['udid']")
+
 
 
-    #  - name: Launch simulator
-    #    run: open -a Simulator --args -CurrentDeviceUDID $(xcrun simctl list --json | ruby -e "require 'json'; puts JSON.parse(ARGF.read)['devices']['com.apple.CoreSimulator.SimRuntime.iOS-17-0'].find { |s| s['name'] == 'iPhone 15' }['udid']")
 
       - name: Test
         #run: xcodebuild test -scheme KukaiCoreSwift -destination "platform=iOS Simulator,OS=16.4,name=iPhone 14" -enableCodeCoverage YES -resultBundlePath "~/xcode-$NOW.xcresult"
         run: xcodebuild test -scheme KukaiCoreSwift -destination "platform=iOS Simulator,OS=17.2,name=iPhone 15" -enableCodeCoverage YES -resultBundlePath "~/xcode-$NOW.xcresult"
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
-        with:
-          category: "/language:swift"
+
+
+      # - name: Perform CodeQL Analysis
+      #   uses: github/codeql-action/analyze@v3
+      #   with:
+      #     category: "/language:swift"
 
+
+
       - name: Upload results
         if: ${{ success() || failure() }}
         uses: actions/[email protected]
         with:
           name: "results-${{ env.NOW }}.xcresult"
           path: "~/xcode-${{ env.NOW }}.xcresult"
-
-
-
-
-
-
-
-
-
-# Checkout the code, and run mxcl's xcodebuild action to run the unit tests
-# jobs:
-#   build:
-#     runs-on: macos-13
-#     strategy:
-#       matrix:
-#         platform:
-#           - iOS
-#         xcode:
-#           - ^15
-#     steps:
-#       - uses: actions/[email protected]
-
-#       - name: Initialize CodeQL
-#         uses: github/codeql-action/init@v2
-#         with:
-#           languages: "swift"
-
-#       - uses: mxcl/[email protected]
-#         with:
-#           platform: ${{ matrix.platform }}
-#           xcode: ${{ matrix.xcode }}
-#           action: test
-#           scheme: KukaiCoreSwift
-#           code-coverage: true
-#           upload-logs: always
-
-#       - name: Perform CodeQL Analysis
-#         uses: github/codeql-action/analyze@v2
-#         with:
-#           category: "/language:swift"
-
-      #- name: Test
-      #  run: xcodebuild -scheme KukaiCoreSwift test -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 12' -enableCodeCoverage YES -resultBundlePath "../../xcode-$GITHUB_RUN_ID.xcresult"
-      #
-      #- name: Upload results
-      #  uses: actions/upload-artifact@v2
-      #  with:
-      #    name: "results-$GITHUB_RUN_ID.xcresult"
-      #    path: "/Users/runner/work/xcode-$GITHUB_RUN_ID.xcresult"
-
-
 

.jazzy.yaml

@@ -5,4 +5,4 @@ xcodebuild_arguments:
   - "-scheme"
   - "KukaiCoreSwift"
   - "-destination"
-  - "platform=iOS Simulator,OS=16.4,name=iPhone 14"
+  - "platform=iOS Simulator,OS=17.2,name=iPhone 15"