From 89d6a6f2e7fe6b719f638ccbd598f8cae1e11f72 Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Fri, 6 Oct 2023 05:31:00 -0500 Subject: [PATCH 1/3] feat: Support for XCode 15 and MacOS 13 --- .github/workflows/ci.yml | 12 +++++++----- .github/workflows/release-automated.yml | 6 +++--- .github/workflows/release-manual-docs.yml | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0991a0963..04433b007 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,8 @@ on: branches: - "**" env: - CI_XCODE_14: /Applications/Xcode_14.2.app/Contents/Developer + CI_XCODE_14: /Applications/Xcode_14.3.1.app/Contents/Developer + CI_XCODE_15: /Applications/Xcode_15.0.app/Contents/Developer jobs: tests: env: @@ -24,8 +25,9 @@ jobs: - test:parseui:all - test:parse_live_query:all - build:starters + - xcode15 # runs build:starters on XCode 15 fail-fast: true - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v3 - name: Setup Ruby @@ -65,9 +67,9 @@ jobs: run: | carthage bootstrap --use-xcframeworks - name: Build-Test - run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake ${{ matrix.script }} + run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake ${{ matrix.script == 'xcode15' && 'build:starters' || matrix.script }} env: - DEVELOPER_DIR: ${{ env.CI_XCODE_14 }} + DEVELOPER_DIR: ${{ (matrix.script == 'xcode15' && env.CI_XCODE_15) || env.CI_XCODE_14 }} - name: Generate Environment Variables if: ${{ always() }} env: @@ -96,7 +98,7 @@ jobs: xcode: true xcode_archive_path: ${{ env.TEST_RESULTS }} docs: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v3 - name: Setup Ruby diff --git a/.github/workflows/release-automated.yml b/.github/workflows/release-automated.yml index 470548d3c..7c6876581 100644 --- a/.github/workflows/release-automated.yml +++ b/.github/workflows/release-automated.yml @@ -3,11 +3,11 @@ on: push: branches: [ master, release, alpha, beta ] env: - CI_XCODE_14: '/Applications/Xcode_14.2.app/Contents/Developer' + CI_XCODE_14: '/Applications/Xcode_14.3.1.app/Contents/Developer' jobs: release: - runs-on: macos-12 + runs-on: macos-13 outputs: current_tag: ${{ steps.tag.outputs.current_tag }} steps: @@ -45,7 +45,7 @@ jobs: publish-docs: needs: release if: needs.release.outputs.current_tag != '' - runs-on: macos-12 + runs-on: macos-13 steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/release-manual-docs.yml b/.github/workflows/release-manual-docs.yml index 33b08bc5f..24729749e 100644 --- a/.github/workflows/release-manual-docs.yml +++ b/.github/workflows/release-manual-docs.yml @@ -6,12 +6,12 @@ on: default: '' description: 'Version tag:' env: - CI_XCODE_14: '/Applications/Xcode_14.2.app/Contents/Developer' + CI_XCODE_14: '/Applications/Xcode_14.3.1.app/Contents/Developer' jobs: publish-docs: if: github.event.inputs.tag != '' - runs-on: macos-12 + runs-on: macos-13 steps: - name: Checkout repository uses: actions/checkout@v3 From 75edc83bbb2785f5a7f795ac229c5097dacd105d Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Fri, 6 Oct 2023 06:08:38 -0500 Subject: [PATCH 2/3] reorder build --- .github/workflows/ci.yml | 2 +- Rakefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04433b007..17b131e54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - test:parse_live_query:all - build:starters - xcode15 # runs build:starters on XCode 15 - fail-fast: true + fail-fast: false runs-on: macos-13 steps: - uses: actions/checkout@v3 diff --git a/Rakefile b/Rakefile index d6eabe018..457d58e91 100644 --- a/Rakefile +++ b/Rakefile @@ -158,10 +158,10 @@ namespace :build do desc 'Build all starters' task :starters do - Rake::Task['build:ios_starters:all'].invoke - Rake::Task['build:macos_starters:all'].invoke Rake::Task['build:tvos_starters:all'].invoke Rake::Task['build:watchos_starters:all'].invoke + Rake::Task['build:ios_starters:all'].invoke + Rake::Task['build:macos_starters:all'].invoke end end From 16967b972953a4782300291c3d4d445428dce1ab Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Fri, 6 Oct 2023 06:34:07 -0500 Subject: [PATCH 3/3] fix twitter test --- .github/workflows/ci.yml | 2 +- .github/workflows/release-automated.yml | 2 +- .github/workflows/release-manual-docs.yml | 2 +- .../Tests/Unit/TwitterAuthenticationProviderTests.m | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17b131e54..9c2c319ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: branches: - "**" env: - CI_XCODE_14: /Applications/Xcode_14.3.1.app/Contents/Developer + CI_XCODE_14: /Applications/Xcode_14.2.app/Contents/Developer CI_XCODE_15: /Applications/Xcode_15.0.app/Contents/Developer jobs: tests: diff --git a/.github/workflows/release-automated.yml b/.github/workflows/release-automated.yml index 7c6876581..f1806a1e6 100644 --- a/.github/workflows/release-automated.yml +++ b/.github/workflows/release-automated.yml @@ -3,7 +3,7 @@ on: push: branches: [ master, release, alpha, beta ] env: - CI_XCODE_14: '/Applications/Xcode_14.3.1.app/Contents/Developer' + CI_XCODE_14: '/Applications/Xcode_14.2.app/Contents/Developer' jobs: release: diff --git a/.github/workflows/release-manual-docs.yml b/.github/workflows/release-manual-docs.yml index 24729749e..a79f99eed 100644 --- a/.github/workflows/release-manual-docs.yml +++ b/.github/workflows/release-manual-docs.yml @@ -6,7 +6,7 @@ on: default: '' description: 'Version tag:' env: - CI_XCODE_14: '/Applications/Xcode_14.3.1.app/Contents/Developer' + CI_XCODE_14: '/Applications/Xcode_14.2.app/Contents/Developer' jobs: publish-docs: diff --git a/ParseTwitterUtils/Tests/Unit/TwitterAuthenticationProviderTests.m b/ParseTwitterUtils/Tests/Unit/TwitterAuthenticationProviderTests.m index 6660317b1..71719b96a 100644 --- a/ParseTwitterUtils/Tests/Unit/TwitterAuthenticationProviderTests.m +++ b/ParseTwitterUtils/Tests/Unit/TwitterAuthenticationProviderTests.m @@ -54,8 +54,6 @@ - (void)testConstructors { provider = [PFTwitterAuthenticationProvider providerWithTwitter:twitter]; XCTAssertNotNil(provider); XCTAssertEqual(provider.twitter, twitter); - - PFAssertThrowsInconsistencyException([PFTwitterAuthenticationProvider new]); } - (void)testAuthData {