Skip to content

Commit ba6334b

Browse files
committed
[wip] Working on CI
* Don’t build the examples as part of a commit.
1 parent 923901a commit ba6334b

File tree

8 files changed

+23
-36
lines changed

8 files changed

+23
-36
lines changed

.github/workflows/ci-master-only.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
cocoapods-lint:
1010
env:
11-
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
11+
DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
1212
name: Verify that podspec lints
1313
runs-on: macOS-latest
1414
steps:

.github/workflows/ci-pull-requests-only.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
buildsh:
1010
env:
11-
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
11+
DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
1212
strategy:
1313
matrix:
1414
mode: [cocoapods-lint-default-subspecs, cocoapods-lint-other-subspecs]

.github/workflows/ci.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on: [push, pull_request]
55
jobs:
66
buildsh:
77
env:
8-
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
8+
DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
99
strategy:
1010
matrix:
11-
mode: [tests, framework, life-without-cocoapods, carthage, examples-pt1, examples-pt2, examples-pt3, examples-pt4]
11+
mode: [tests, framework, life-without-cocoapods, carthage]
1212
include:
1313
- mode: tests
1414
name: Build and run tests
@@ -18,14 +18,6 @@ jobs:
1818
name: Build Texture as a static library
1919
- mode: carthage
2020
name: Verify that Carthage works
21-
- mode: examples-pt1
22-
name: Build examples (examples-pt1)
23-
- mode: examples-pt2
24-
name: Build examples (examples-pt2)
25-
- mode: examples-pt3
26-
name: Build examples (examples-pt3)
27-
- mode: examples-pt4
28-
name: Build examples (examples-pt4)
2921
name: ${{ matrix.name }}
3022
runs-on: macOS-latest
3123
steps:

Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
source 'https://cdn.cocoapods.org/'
2-
platform :ios, '9.0'
2+
platform :ios, '13.0'
33

44
target :'AsyncDisplayKitTests' do
5-
platform :ios, '10.0'
5+
platform :ios, '13.0'
66
use_frameworks!
77
pod 'OCMock', '~>3.6'
88
pod 'iOSSnapshotTestCase/Core', '~> 6.2'

Source/ASDisplayNode+Yoga.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ - (void)invalidateCalculatedYogaLayout
305305
YGNodeRef yogaNode = self.style.yogaNode;
306306
if (yogaNode && [self shouldHaveYogaMeasureFunc]) {
307307
// Yoga internally asserts that MarkDirty() may only be called on nodes with a measurement function.
308-
BOOL needsTemporaryMeasureFunc = (YGNodeGetMeasureFunc(yogaNode) == NULL);
308+
BOOL needsTemporaryMeasureFunc = !YGNodeHasMeasureFunc(yogaNode);
309309
if (needsTemporaryMeasureFunc) {
310310
ASDisplayNodeAssert(self.yogaLayoutInProgress == NO,
311311
@"shouldHaveYogaMeasureFunc == YES, and inside a layout pass, but no measure func pointer! %@", self);

SubspecWorkspaces/ASDKListKit/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://cdn.cocoapods.org/'
22

3-
platform :ios, '9.0'
3+
platform :ios, '13.0'
44
target 'ASDKListKitTests' do
55
pod 'Texture/IGListKit', :path => '../..'
66
pod 'OCMock', '~> 3.4'

Texture.podspec

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Pod::Spec.new do |spec|
1111

1212
spec.documentation_url = 'http://texturegroup.org/appledoc/'
1313

14-
spec.ios.deployment_target = '9.0'
15-
spec.tvos.deployment_target = '9.0'
14+
spec.ios.deployment_target = '13.4'
15+
spec.tvos.deployment_target = '13.4'
1616

1717
# Subspecs
1818
spec.subspec 'Core' do |core|
@@ -54,7 +54,8 @@ Pod::Spec.new do |spec|
5454

5555
spec.subspec 'Yoga' do |yoga|
5656
yoga.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) YOGA=1' }
57-
yoga.dependency 'Yoga', '1.6.0'
57+
yoga.dependency 'Yoga', '2.0.0'
58+
yoga.ios.deployment_target = '13.4'
5859
yoga.dependency 'Texture/Core'
5960
end
6061

build.sh

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#!/bin/bash
2-
# echo ************* diagnostics
3-
# echo available devices
4-
# instruments -s devices
5-
# echo available sdk
6-
# xcodebuild -showsdks
7-
# echo available Xcode
8-
# ls -ld /Applications/Xcode*
9-
# echo ************* diagnostics end
2+
echo ************* diagnostics
3+
echo available devices
4+
instruments -s devices
5+
echo available sdk
6+
xcodebuild -showsdks
7+
echo available Xcode
8+
ls -ld /Applications/Xcode*
9+
echo ************* diagnostics end
1010

1111
# run this on a 2x device until we've updated snapshot images to 3x
12-
PLATFORM="${TEXTURE_BUILD_PLATFORM:-platform=iOS Simulator,OS=16.2,name=iPhone SE (3rd generation)}"
13-
SDK="${TEXTURE_BUILD_SDK:-iphonesimulator16.2}"
12+
PLATFORM="${TEXTURE_BUILD_PLATFORM:-platform=iOS Simulator,OS=17.2,name=iPhone SE (3rd generation)}"
13+
SDK="${TEXTURE_BUILD_SDK:-iphonesimulator17.2}"
1414
DERIVED_DATA_PATH="~/ASDKDerivedData"
1515

1616
# It is pitch black.
@@ -41,7 +41,6 @@ function build_example {
4141
set -o pipefail && xcodebuild \
4242
-workspace "${example}/Sample.xcworkspace" \
4343
-scheme Sample \
44-
-sdk "$SDK" \
4544
-destination "$PLATFORM" \
4645
-derivedDataPath "$DERIVED_DATA_PATH" \
4746
build
@@ -57,7 +56,6 @@ function build_example {
5756
set -o pipefail && xcodebuild \
5857
-project "Sample.xcodeproj" \
5958
-scheme Sample \
60-
-sdk "$SDK" \
6159
-destination "$PLATFORM" \
6260
build
6361

@@ -67,7 +65,7 @@ function build_example {
6765

6866
# Lint subspec
6967
function lint_subspec {
70-
set -o pipefail && pod env && pod lib lint --allow-warnings --subspec="$1"
68+
set -o pipefail && pod env && pod lib lint --verbose --allow-warnings --subspec="$1"
7169
}
7270

7371
function cleanup {
@@ -87,7 +85,6 @@ tests|all)
8785
set -o pipefail && xcodebuild \
8886
-workspace AsyncDisplayKit.xcworkspace \
8987
-scheme AsyncDisplayKit \
90-
-sdk "$SDK" \
9188
-destination "$PLATFORM" \
9289
build-for-testing test
9390
success="1"
@@ -99,7 +96,6 @@ tests_listkit)
9996
set -o pipefail && xcodebuild \
10097
-workspace SubspecWorkspaces/ASDKListKit/ASDKListKit.xcworkspace \
10198
-scheme ASDKListKitTests \
102-
-sdk "$SDK" \
10399
-destination "$PLATFORM" \
104100
build-for-testing test
105101
success="1"
@@ -198,7 +194,6 @@ life-without-cocoapods|all)
198194
set -o pipefail && xcodebuild \
199195
-workspace "smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcworkspace" \
200196
-scheme "Life Without CocoaPods" \
201-
-sdk "$SDK" \
202197
-destination "$PLATFORM" \
203198
build
204199
success="1"
@@ -210,7 +205,6 @@ framework|all)
210205
set -o pipefail && xcodebuild \
211206
-project "smoke-tests/Framework/Sample.xcodeproj" \
212207
-scheme Sample \
213-
-sdk "$SDK" \
214208
-destination "$PLATFORM" \
215209
build
216210
success="1"

0 commit comments

Comments
 (0)