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

Updating ci.yml to run macOS 11 #679

Merged
merged 2 commits into from
Aug 13, 2021
Merged

Updating ci.yml to run macOS 11 #679

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
4bd84ae
Updating ci.yml to run macos11
Aug 13, 2021
0bfdea6
Updating missed macocos 11 changes + updating xcode version to 12.5
Aug 13, 2021
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
2 changes: 1 addition & 1 deletion .ado/templates/fluentui-apple-publish-nuget-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
jobs:
- job: fluentui_apple_publish_nuget
pool:
vmImage: 'macos-10.15'
vmImage: 'macos-11'
displayName: FluentUI Apple Publish NuGet
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
validation:
runs-on: macos-10.15
runs-on: macos-11
strategy:
fail-fast: true
steps:
Expand All @@ -26,7 +26,7 @@ jobs:
- name: validation
run: scripts/validation.sh
xcodebuild:
runs-on: macos-10.15
runs-on: macos-11
strategy:
fail-fast: false
matrix:
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 @@ -11,7 +11,7 @@ on:
- 0.[0-9]+.[0-9]+_main*
jobs:
Pod-Publish:
runs-on: macOS-10.15
runs-on: macOS-11

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion scripts/xcode_select_current_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if [ -n "$XCODE_PATH_OVERRIDE" ]; then # If someone calls this with the XCODE_PATH_OVERRIDE variable set to a path to a developer dir, use it instead
XCODE_PATH="$XCODE_PATH_OVERRIDE"
else
XCODE_PATH='/Applications/Xcode_12.2.app/Contents/Developer'
XCODE_PATH='/Applications/Xcode_12.5.app/Contents/Developer'
fi

echo "Running command: sudo xcode-select --switch $XCODE_PATH"
Expand Down