diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index 5303b27fb..a9be448eb 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -13,12 +13,20 @@ 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.4, 16.2 ] + arch: [ arm64 ] 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,15 +35,15 @@ 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 run: | openssl version - - name: Test project - run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" test ARCHS="${{ matrix.arch }}" + - 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 run: xcodebuild -workspace ObjectiveGitFramework.xcworkspace -scheme "ObjectiveGit Mac" archive ARCHS="${{ matrix.arch }}" 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..df35718ea 160000 --- a/Carthage/Checkouts/ZipArchive +++ b/Carthage/Checkouts/ZipArchive @@ -1 +1 @@ -Subproject commit 825ff12a74a94c54e737e279604c27e6740e8a2c +Subproject commit df35718ea19a94e015b91dc4881dee028ce4cdba