Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Apple silicon images on CI. #1793

Closed
wants to merge 4 commits into from
Closed

Use Apple silicon images on CI. #1793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5832689
Use Apple silicon images on CI.
colinrtwhite Jan 30, 2024
5321e22
Use arm64.
colinrtwhite Jan 31, 2024
19aa28c
Attempt fix.
colinrtwhite Jan 31, 2024
2ed6bd9
Disable signing.
colinrtwhite Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
if-no-files-found: error

screenshot-tests:
runs-on: macos-latest
runs-on: macos-14
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -85,7 +85,7 @@ jobs:
- run: xcodebuild -project redwood-layout-uiview/RedwoodLayoutUIViewTests.xcodeproj -scheme RedwoodLayoutUIViewTests -destination 'platform=iOS Simulator,name=iPhone 12,OS=latest' test

sample-counter:
runs-on: macos-latest
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand All @@ -96,6 +96,8 @@ jobs:

- run: ./gradlew -p samples/counter build

- run: ./scripts/write_entitlements.sh

- name: Build Counter iOS (UIKit)
run: xcodebuild -project samples/counter/ios-uikit/CounterApp.xcodeproj -scheme CounterApp -destination 'platform=iOS Simulator,name=iPhone 12,OS=latest'

Expand All @@ -118,11 +120,12 @@ jobs:
- uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
arch: arm64-v8a
emulator-boot-timeout: 20000
script: ./gradlew -p samples/counter connectedCheck

sample-emoji:
runs-on: macos-latest
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand All @@ -133,6 +136,8 @@ jobs:

- run: ./gradlew -p samples/emoji-search build

- run: ./scripts/write_entitlements.sh

- name: Build Emoji Search iOS (UIKit)
run: xcodebuild -project samples/emoji-search/ios-uikit/EmojiSearchApp.xcodeproj -scheme EmojiSearchApp -destination 'platform=iOS Simulator,name=iPhone 12,OS=latest'

Expand All @@ -155,11 +160,12 @@ jobs:
- uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
arch: arm64-v8a
emulator-boot-timeout: 20000
script: ./gradlew -p samples/emoji-search connectedCheck

test-app:
runs-on: macos-latest
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand All @@ -174,7 +180,7 @@ jobs:
run: xcodebuild -project test-app/ios-uikit/TestApp.xcodeproj -scheme TestApp -destination 'platform=iOS Simulator,name=iPhone 12,OS=latest'

publish:
runs-on: macos-latest
runs-on: macos-14
if: ${{ github.ref == 'refs/heads/trunk' && github.repository == 'cashapp/redwood' }}
needs:
- build
Expand Down
8 changes: 6 additions & 2 deletions redwood-layout-uiview/RedwoodLayoutUIViewTests.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,9 @@
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
"$(PROJECT_DIR)/build/xcode-frameworks",
Expand All @@ -337,6 +338,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = app.cash.redwood.layout.uiview.testing;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_OBJC_BRIDGING_HEADER = "RedwoodLayoutUIViewTests/RedwoodLayoutUIViewTests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -350,8 +352,9 @@
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
"$(PROJECT_DIR)/build/xcode-frameworks",
Expand All @@ -375,6 +378,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = app.cash.redwood.layout.uiview.testing;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_OBJC_BRIDGING_HEADER = "RedwoodLayoutUIViewTests/RedwoodLayoutUIViewTests-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down
23 changes: 23 additions & 0 deletions scripts/write_entitlements.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash
set -e

# Modified from:
# https://stackoverflow.com/questions/67264212/android-emulator-crash-when-start-hvf-error-hv-error

original_dir=$(pwd)
target_dir=~/Library/Android/sdk/emulator/qemu/darwin-aarch64
file_path=entitlements.xml

xml_content='<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.hypervisor</key>
<true/>
</dict>
</plist>'

cd "$target_dir"
echo "$xml_content" > "$file_path"
codesign -s - --entitlements entitlements.xml --force ./qemu-system-aarch64
cd "$original_dir"
Loading