From ba6334b9982298450ce14e99d823de270d9a081a Mon Sep 17 00:00:00 2001 From: rcancro Date: Sat, 4 May 2024 16:35:31 -0700 Subject: [PATCH] [wip] Working on CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Don’t build the examples as part of a commit. --- .github/workflows/ci-master-only.yml | 2 +- .github/workflows/ci-pull-requests-only.yml | 2 +- .github/workflows/ci.yml | 12 ++------- Podfile | 4 +-- Source/ASDisplayNode+Yoga.mm | 2 +- SubspecWorkspaces/ASDKListKit/Podfile | 2 +- Texture.podspec | 7 +++--- build.sh | 28 ++++++++------------- 8 files changed, 23 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci-master-only.yml b/.github/workflows/ci-master-only.yml index a6086f4ba..3ed4aa746 100644 --- a/.github/workflows/ci-master-only.yml +++ b/.github/workflows/ci-master-only.yml @@ -8,7 +8,7 @@ on: jobs: cocoapods-lint: env: - DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer name: Verify that podspec lints runs-on: macOS-latest steps: diff --git a/.github/workflows/ci-pull-requests-only.yml b/.github/workflows/ci-pull-requests-only.yml index 74589129a..52ed31499 100644 --- a/.github/workflows/ci-pull-requests-only.yml +++ b/.github/workflows/ci-pull-requests-only.yml @@ -8,7 +8,7 @@ on: jobs: buildsh: env: - DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer strategy: matrix: mode: [cocoapods-lint-default-subspecs, cocoapods-lint-other-subspecs] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a93bf690f..e2d59978a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,10 +5,10 @@ on: [push, pull_request] jobs: buildsh: env: - DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer strategy: matrix: - mode: [tests, framework, life-without-cocoapods, carthage, examples-pt1, examples-pt2, examples-pt3, examples-pt4] + mode: [tests, framework, life-without-cocoapods, carthage] include: - mode: tests name: Build and run tests @@ -18,14 +18,6 @@ jobs: name: Build Texture as a static library - mode: carthage name: Verify that Carthage works - - mode: examples-pt1 - name: Build examples (examples-pt1) - - mode: examples-pt2 - name: Build examples (examples-pt2) - - mode: examples-pt3 - name: Build examples (examples-pt3) - - mode: examples-pt4 - name: Build examples (examples-pt4) name: ${{ matrix.name }} runs-on: macOS-latest steps: diff --git a/Podfile b/Podfile index c53e55456..d3bf6075a 100644 --- a/Podfile +++ b/Podfile @@ -1,8 +1,8 @@ source 'https://cdn.cocoapods.org/' -platform :ios, '9.0' +platform :ios, '13.0' target :'AsyncDisplayKitTests' do - platform :ios, '10.0' + platform :ios, '13.0' use_frameworks! pod 'OCMock', '~>3.6' pod 'iOSSnapshotTestCase/Core', '~> 6.2' diff --git a/Source/ASDisplayNode+Yoga.mm b/Source/ASDisplayNode+Yoga.mm index 619f5a780..4c847e649 100644 --- a/Source/ASDisplayNode+Yoga.mm +++ b/Source/ASDisplayNode+Yoga.mm @@ -305,7 +305,7 @@ - (void)invalidateCalculatedYogaLayout YGNodeRef yogaNode = self.style.yogaNode; if (yogaNode && [self shouldHaveYogaMeasureFunc]) { // Yoga internally asserts that MarkDirty() may only be called on nodes with a measurement function. - BOOL needsTemporaryMeasureFunc = (YGNodeGetMeasureFunc(yogaNode) == NULL); + BOOL needsTemporaryMeasureFunc = !YGNodeHasMeasureFunc(yogaNode); if (needsTemporaryMeasureFunc) { ASDisplayNodeAssert(self.yogaLayoutInProgress == NO, @"shouldHaveYogaMeasureFunc == YES, and inside a layout pass, but no measure func pointer! %@", self); diff --git a/SubspecWorkspaces/ASDKListKit/Podfile b/SubspecWorkspaces/ASDKListKit/Podfile index 0f2828e60..9f0c8a6a2 100644 --- a/SubspecWorkspaces/ASDKListKit/Podfile +++ b/SubspecWorkspaces/ASDKListKit/Podfile @@ -1,6 +1,6 @@ source 'https://cdn.cocoapods.org/' -platform :ios, '9.0' +platform :ios, '13.0' target 'ASDKListKitTests' do pod 'Texture/IGListKit', :path => '../..' pod 'OCMock', '~> 3.4' diff --git a/Texture.podspec b/Texture.podspec index 86caec693..b29b8fe5a 100644 --- a/Texture.podspec +++ b/Texture.podspec @@ -11,8 +11,8 @@ Pod::Spec.new do |spec| spec.documentation_url = 'http://texturegroup.org/appledoc/' - spec.ios.deployment_target = '9.0' - spec.tvos.deployment_target = '9.0' + spec.ios.deployment_target = '13.4' + spec.tvos.deployment_target = '13.4' # Subspecs spec.subspec 'Core' do |core| @@ -54,7 +54,8 @@ Pod::Spec.new do |spec| spec.subspec 'Yoga' do |yoga| yoga.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) YOGA=1' } - yoga.dependency 'Yoga', '1.6.0' + yoga.dependency 'Yoga', '2.0.0' + yoga.ios.deployment_target = '13.4' yoga.dependency 'Texture/Core' end diff --git a/build.sh b/build.sh index 886d8ced6..488b2b06a 100755 --- a/build.sh +++ b/build.sh @@ -1,16 +1,16 @@ #!/bin/bash -# echo ************* diagnostics -# echo available devices -# instruments -s devices -# echo available sdk -# xcodebuild -showsdks -# echo available Xcode -# ls -ld /Applications/Xcode* -# echo ************* diagnostics end +echo ************* diagnostics +echo available devices +instruments -s devices +echo available sdk +xcodebuild -showsdks +echo available Xcode +ls -ld /Applications/Xcode* +echo ************* diagnostics end # run this on a 2x device until we've updated snapshot images to 3x -PLATFORM="${TEXTURE_BUILD_PLATFORM:-platform=iOS Simulator,OS=16.2,name=iPhone SE (3rd generation)}" -SDK="${TEXTURE_BUILD_SDK:-iphonesimulator16.2}" +PLATFORM="${TEXTURE_BUILD_PLATFORM:-platform=iOS Simulator,OS=17.2,name=iPhone SE (3rd generation)}" +SDK="${TEXTURE_BUILD_SDK:-iphonesimulator17.2}" DERIVED_DATA_PATH="~/ASDKDerivedData" # It is pitch black. @@ -41,7 +41,6 @@ function build_example { set -o pipefail && xcodebuild \ -workspace "${example}/Sample.xcworkspace" \ -scheme Sample \ - -sdk "$SDK" \ -destination "$PLATFORM" \ -derivedDataPath "$DERIVED_DATA_PATH" \ build @@ -57,7 +56,6 @@ function build_example { set -o pipefail && xcodebuild \ -project "Sample.xcodeproj" \ -scheme Sample \ - -sdk "$SDK" \ -destination "$PLATFORM" \ build @@ -67,7 +65,7 @@ function build_example { # Lint subspec function lint_subspec { - set -o pipefail && pod env && pod lib lint --allow-warnings --subspec="$1" + set -o pipefail && pod env && pod lib lint --verbose --allow-warnings --subspec="$1" } function cleanup { @@ -87,7 +85,6 @@ tests|all) set -o pipefail && xcodebuild \ -workspace AsyncDisplayKit.xcworkspace \ -scheme AsyncDisplayKit \ - -sdk "$SDK" \ -destination "$PLATFORM" \ build-for-testing test success="1" @@ -99,7 +96,6 @@ tests_listkit) set -o pipefail && xcodebuild \ -workspace SubspecWorkspaces/ASDKListKit/ASDKListKit.xcworkspace \ -scheme ASDKListKitTests \ - -sdk "$SDK" \ -destination "$PLATFORM" \ build-for-testing test success="1" @@ -198,7 +194,6 @@ life-without-cocoapods|all) set -o pipefail && xcodebuild \ -workspace "smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcworkspace" \ -scheme "Life Without CocoaPods" \ - -sdk "$SDK" \ -destination "$PLATFORM" \ build success="1" @@ -210,7 +205,6 @@ framework|all) set -o pipefail && xcodebuild \ -project "smoke-tests/Framework/Sample.xcodeproj" \ -scheme Sample \ - -sdk "$SDK" \ -destination "$PLATFORM" \ build success="1"