From 2d2f4e34d6e16da2e2fd6bd571fd48427a3d45ae 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 ++-------- build.sh | 26 ++++++++------------- 4 files changed, 14 insertions(+), 28 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/build.sh b/build.sh index 886d8ced6..59dc9b058 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 @@ -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"