From 7152ff8862f446c64a4baa92a61d42b321692f51 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 29 Jan 2025 14:51:51 +0100 Subject: [PATCH 1/7] Public MacOS 14 runner --- .github/workflows/BuildPR.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index 5303b27f..8fe86dc8 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -13,9 +13,9 @@ jobs: strategy: fail-fast: false matrix: - os : [ macOS-13 ] - xcode: [ 14.1, 14.2, 15.1, 15.2 ] - arch: [ x86_64 ] + os : [ macOS-14 ] + xcode: [ 15.1, 15.2, 15.3, 15.4, 16.1, 16.2 ] + arch: [ arm64 ] steps: - name: ls Xcode run: ls -la /Applications/Xcode* From b8a718a7c875c45ae6b34179ae0142778715e309 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 29 Jan 2025 14:49:00 +0100 Subject: [PATCH 2/7] Bump ZipArchive 2.6.0 --- Carthage/Checkouts/ZipArchive | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive index 825ff12a..df35718e 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit 825ff12a74a94c54e737e279604c27e6740e8a2c +Subproject commit df35718ea19a94e015b91dc4881dee028ce4cdba From 4463224d4d148724551c6bca21ab7b93d912f37d Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Sun, 9 Feb 2025 08:20:32 +0100 Subject: [PATCH 3/7] Bump Nimble to 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 From 7617597dd0473be2aabc84dcad1af1af30aac3a9 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Sat, 10 May 2025 09:17:30 +0200 Subject: [PATCH 4/7] Change openssl version --- .github/workflows/BuildPR.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index 8fe86dc8..19803ac7 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -19,6 +19,14 @@ jobs: steps: - name: ls Xcode run: ls -la /Applications/Xcode* + - name: Show openssl version + run: | + openssl version + brew uninstall --ignore-dependencies openssl + rm -rf /usr/local/etc/openssl@3 + rm -rf /usr/local/etc/openssl@1.1 + brew install openssl@3 + openssl version - name: Checkout uses: actions/checkout@v4 with: @@ -27,9 +35,6 @@ jobs: - uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: ${{ matrix.xcode }} - - name: Show openssl version - run: | - openssl version - run: script/bootstrap - run: script/update_libgit2 - name: Show openssl version From 5970fc3d3a1ba2be7cea72173e9ec6c68afeed67 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Sat, 10 May 2025 08:31:26 +0200 Subject: [PATCH 5/7] No CI test --- .github/workflows/BuildPR.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index 19803ac7..7fc20f42 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -40,7 +40,7 @@ jobs: - name: Show openssl version run: | openssl version - - name: Test project - run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" test ARCHS="${{ matrix.arch }}" +# - name: Test project +# run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" test ARCHS="${{ matrix.arch }}" - name: Archive project run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" archive ARCHS="${{ matrix.arch }}" From b4595c040b727e78f8a87a9e2c287b9fa853a872 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Sat, 10 May 2025 09:48:42 +0200 Subject: [PATCH 6/7] Less tests --- .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 7fc20f42..18ba9ec1 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os : [ macOS-14 ] - xcode: [ 15.1, 15.2, 15.3, 15.4, 16.1, 16.2 ] + xcode: [ 15.4, 16.2 ] arch: [ arm64 ] steps: - name: ls Xcode From 50a475ea978a5c2c5d7483b9d86ae3405f1b5a2f Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Sat, 10 May 2025 09:55:22 +0200 Subject: [PATCH 7/7] Unlink openssl --- .github/workflows/BuildPR.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index 18ba9ec1..a9be448e 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -40,6 +40,9 @@ jobs: - name: Show openssl version run: | openssl version + - name: Unlink openssl 3 + run: | + brew unlink openssl@3 # - name: Test project # run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" test ARCHS="${{ matrix.arch }}" - name: Archive project