diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index 67edf9fc9..69d306114 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -9,11 +9,17 @@ on: jobs: build-objective-git: name: Build objective-git - runs-on: macOS-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: + os: [ macos-11 ] + abi: [ x86_64 ] xcode: [ Xcode_14.2, Xcode_13.4 ] + include: + - xcode: Xcode + os: ARM64 + abi: arm64 steps: - name: ls Xcode run: ls -la /Applications/Xcode* @@ -33,4 +39,4 @@ jobs: run: | openssl version - name: Test and archive project - run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" test archive ARCHS="x86_64" + run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" test ARCHS="${{ matrix.abi }}" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index c93f16c25..1c49fc124 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit c93f16c25af5770f0d3e6af27c9634640946b068 +Subproject commit 1c49fc1243018f81a7ea99cb5e0985b00096e9f4 diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index 825ff12a7..bc8bdb521 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit 825ff12a74a94c54e737e279604c27e6740e8a2c +Subproject commit bc8bdb5216f9b37071a917025d76183a2ea41135 diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 1a438dfef..ed4050a4d 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1755,7 +1755,7 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", @@ -1795,7 +1795,7 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", @@ -1877,7 +1877,7 @@ /usr/local/include, ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1898,7 +1898,7 @@ /usr/local/include, ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1930,7 +1930,7 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", @@ -1984,7 +1984,7 @@ /usr/local/include, ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -2148,7 +2148,7 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", @@ -2202,7 +2202,7 @@ /usr/local/include, ); INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0;