From e68e20917095d91eecbda54d5dbe5eff8fdc0f70 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Tue, 7 Jun 2022 14:05:55 +0200 Subject: [PATCH 1/6] arm64 runner on CI --- .github/workflows/BuildPR.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index 67edf9fc..d6e6306d 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 archive ARCHS="${{ matrix.abi }}" From 8a564519bbf469b07917778fea955fc7433848fc Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 20 Dec 2023 09:58:32 +0100 Subject: [PATCH 2/6] Deployment target 10.13 --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index 1a438dfe..ed4050a4 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; From 8f97964b0fab7b73b9bd101053838dda3c7af5b3 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 20 Dec 2023 11:06:41 +0100 Subject: [PATCH 3/6] No archive during CI --- .github/workflows/BuildPR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index d6e6306d..69d30611 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -39,4 +39,4 @@ jobs: run: | openssl version - name: Test and archive project - run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" test archive ARCHS="${{ matrix.abi }}" + run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" test ARCHS="${{ matrix.abi }}" From aa08a0c3ccf9b01fc1f51f90bd9a123cdcc65a76 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 20 Dec 2023 11:10:25 +0100 Subject: [PATCH 4/6] Bump Ziparchive 2.4.3 --- Carthage/Checkouts/ZipArchive | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index 825ff12a..38e0ce05 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit 825ff12a74a94c54e737e279604c27e6740e8a2c +Subproject commit 38e0ce0598e06b034271f296a8e15b149c91aa19 From 05817610eeaca797e1dc1a0c1e6315f49946d4e9 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 20 Dec 2023 11:12:42 +0100 Subject: [PATCH 5/6] Bump Ziparchive 2.5.0 --- Carthage/Checkouts/ZipArchive | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index 38e0ce05..bc8bdb52 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit 38e0ce0598e06b034271f296a8e15b149c91aa19 +Subproject commit bc8bdb5216f9b37071a917025d76183a2ea41135 From bd6f6cafea95e7bdbf4dafd32ec87a31406a454f Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Fri, 3 May 2024 08:01:10 +0200 Subject: [PATCH 6/6] Bump Nimble v13.3.0 --- Carthage/Checkouts/Nimble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index c93f16c2..1c49fc12 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit c93f16c25af5770f0d3e6af27c9634640946b068 +Subproject commit 1c49fc1243018f81a7ea99cb5e0985b00096e9f4