diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a13a98..c44c3eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,18 +9,20 @@ jobs: fail-fast: false matrix: include: - - os: macos-12 - arch: x86_64 + # - os: macos-12 + # arch: x86_64 + # xcode: 14.2 - os: macos-13 arch: x86_64 + xcode: 15.2 timeout-minutes: 5 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - run: git submodule update --init - - # this build requires XCode >= 15.3 and hence will fail on CI until - # that requirement is met. For some reason, the KeyboardShortcuts - # package requires Package.resolved from that version of XCode, so our - # hands are tied - # - run: make build-${{ matrix.arch }} + - name: Select XCode version + run: | + sudo ls -1 /Applications | grep "Xcode" + XCODE='/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer' + sudo xcode-select -s $XCODE + - run: make build-${{ matrix.arch }} diff --git a/Helium.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Helium.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/Helium.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/Helium.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Helium.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 0acc61a..0000000 --- a/Helium.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,15 +0,0 @@ -{ - "originHash" : "69c39523ac0471922b625cc56b8722155cfd2afd660bdd4f5ff67335b5b87714", - "pins" : [ - { - "identity" : "keyboardshortcuts", - "kind" : "remoteSourceControl", - "location" : "https://github.com/sindresorhus/KeyboardShortcuts", - "state" : { - "revision" : "2e5f15581fefb821d4b366e57d817be8bf12aa58", - "version" : "2.0.1" - } - } - ], - "version" : 3 -}