Skip to content

Commit

Permalink
[wip] Working on CI
Browse files Browse the repository at this point in the history
* Don’t build the examples as part of a commit.
  • Loading branch information
rcancro committed May 6, 2024
1 parent 923901a commit ba6334b
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-master-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pull-requests-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Source/ASDisplayNode+Yoga.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion SubspecWorkspaces/ASDKListKit/Podfile
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
7 changes: 4 additions & 3 deletions Texture.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down Expand Up @@ -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

Expand Down
28 changes: 11 additions & 17 deletions build.sh
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -57,7 +56,6 @@ function build_example {
set -o pipefail && xcodebuild \
-project "Sample.xcodeproj" \
-scheme Sample \
-sdk "$SDK" \
-destination "$PLATFORM" \
build

Expand All @@ -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 {
Expand All @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit ba6334b

Please sign in to comment.