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

Bump CI to macOS 14 and build visionOS debug simulator #1966

Merged
merged 2 commits into from
Feb 8, 2024
Merged

Bump CI to macOS 14 and build visionOS debug simulator #1966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcb8e8c
Bump CI to macOS 14 and build visionOS debug simulator
mischreiber Feb 8, 2024
a0758d0
Merge branch 'main' into visionOS-CI
mischreiber Feb 8, 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
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
validation:
runs-on: macos-13
runs-on: macos-14
strategy:
fail-fast: true
steps:
Expand All @@ -24,7 +24,7 @@ jobs:
- name: validation
run: scripts/validation.sh
xcodebuild:
runs-on: macos-13
runs-on: macos-14
strategy:
fail-fast: false
matrix:
Expand All @@ -33,6 +33,7 @@ jobs:
'macos_build FluentUITestApp-macOS Debug build -resultBundlePath TestResultsMac test -destination "platform=macOS,arch=x86_64"',
'ios_simulator_build Demo.Development Debug build test -resultBundlePath TestResultsiOS -destination "platform=iOS Simulator,name=iPhone 14 Pro"',
'ios_device_build Demo.Development Release build',
'visionos_simulator_build Demo.Development Debug build',
]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/podPublish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- 0.2.[0-9]+_main_0.2
jobs:
Pod-Publish:
runs-on: macos-13
runs-on: macos-14

steps:
- uses: actions/checkout@v3
Expand Down
8 changes: 8 additions & 0 deletions scripts/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ echo "Building iOS Release Static Lib Device"
$XCODEBUILD_WRAPPER_LOCATION ios_device_build FluentUI-iOS Release build
handle_exit_code

echo "Building visionOS Static Lib Debug Simulator"
$XCODEBUILD_WRAPPER_LOCATION visionos_simulator_build FluentUI-iOS Debug build
handle_exit_code

echo "Building iOS Testapp Debug Simulator"
$XCODEBUILD_WRAPPER_LOCATION ios_simulator_build Demo.Development Debug build
handle_exit_code
Expand All @@ -69,6 +73,10 @@ echo "Building iOS Testapp Release Device"
$XCODEBUILD_WRAPPER_LOCATION ios_device_build Demo.Development Release build
handle_exit_code

echo "Building visionOS Testapp Debug Simulator"
$XCODEBUILD_WRAPPER_LOCATION visionos_simulator_build Demo.Development Debug build
handle_exit_code

# Check if any of our individual build steps failed
if [ $EXIT_CODE -ne 0 ]
then
Expand Down
11 changes: 11 additions & 0 deletions scripts/xcodebuild_wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,17 @@ function macos_build()
return $?
}

# Run a visionOS simulator xcodebuild invocation with the specified scheme, configuration, and build commands
#
# \param $1 scheme
# \param $2 configuration
# \param $3+ build commands
function visionos_simulator_build()
{
invoke_xcodebuild workspace "ios/FluentUI.xcworkspace" "$1" "$2" xrsimulator "${@:3}"
return $?
}

# Execute commands passed in to this script and forward on the exit code.
"$@"
exit $?
Loading