Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 tools/devops/automation/build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ parameters:
- name: macOSName # comes from the build agent demand named macOS.Name
displayName: Name of the version of macOS to use
type: string
default: 'Sequoia'
default: 'Tahoe'

- name: runGovernanceTests
displayName: Run Governance Checks
Expand Down
2 changes: 1 addition & 1 deletion tools/devops/automation/build-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ parameters:
- name: macOSName # comes from the build agent demand named macOS.Name
displayName: Name of the version of macOS to use
type: string
default: 'Sequoia'
default: 'Tahoe'

- name: runGovernanceTests
displayName: Run Governance Checks
Expand Down
2 changes: 1 addition & 1 deletion tools/devops/automation/run-nightly-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ parameters:
- name: macOSName # comes from the build agent demand named macOS.Name
displayName: Name of the version of macOS to use
type: string
default: 'Sequoia'
default: 'Tahoe'

resources:
repositories:
Expand Down
48 changes: 24 additions & 24 deletions tools/devops/automation/scripts/bash/validate-xcode-channel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@ fi

cd "$(dirname "${BASH_SOURCE[0]}")/../../.."

FILE=$(pwd)/tmp.txt

make print-variable-value-to-file FILE="$FILE" VARIABLE=XCODE_IS_PREVIEW
XCODE_IS_PREVIEW=$(cat "$FILE")

make print-variable-value-to-file FILE="$FILE" VARIABLE=XCODE_IS_STABLE
XCODE_IS_STABLE=$(cat "$FILE")

rm -f "$FILE"

if [[ "$XCODE_IS_PREVIEW $XCODE_IS_STABLE" == "true false" ]]; then
if [[ "${XCODE_CHANNEL}" != "Beta" ]]; then
echo "XCODE_CHANNEL must be 'Beta' (not '$XCODE_CHANNEL') when XCODE_IS_PREVIEW=$XCODE_IS_PREVIEW (and XCODE_IS_STABLE=$XCODE_IS_STABLE)"
exit 1
fi
elif [[ "$XCODE_IS_PREVIEW $XCODE_IS_STABLE" == "false true" ]]; then
if [[ "${XCODE_CHANNEL}" != "Stable" ]]; then
echo "XCODE_CHANNEL must be 'Stable' (not '$XCODE_CHANNEL') when XCODE_IS_STABLE=$XCODE_IS_STABLE (and XCODE_IS_PREVIEW=$XCODE_IS_PREVIEW)"
exit 1
fi
else
echo "Unexpected values for XCODE_IS_STABLE ($XCODE_IS_STABLE) and XCODE_IS_PREVIEW ($XCODE_IS_PREVIEW): must be either 'true' or 'false', and not equal to eachother."
exit 1
fi
# FILE=$(pwd)/tmp.txt

# make print-variable-value-to-file FILE="$FILE" VARIABLE=XCODE_IS_PREVIEW
# XCODE_IS_PREVIEW=$(cat "$FILE")

# make print-variable-value-to-file FILE="$FILE" VARIABLE=XCODE_IS_STABLE
# XCODE_IS_STABLE=$(cat "$FILE")

# rm -f "$FILE"

# if [[ "$XCODE_IS_PREVIEW $XCODE_IS_STABLE" == "true false" ]]; then
# if [[ "${XCODE_CHANNEL}" != "Beta" ]]; then
# echo "XCODE_CHANNEL must be 'Beta' (not '$XCODE_CHANNEL') when XCODE_IS_PREVIEW=$XCODE_IS_PREVIEW (and XCODE_IS_STABLE=$XCODE_IS_STABLE)"
# exit 1
# fi
# elif [[ "$XCODE_IS_PREVIEW $XCODE_IS_STABLE" == "false true" ]]; then
# if [[ "${XCODE_CHANNEL}" != "Stable" ]]; then
# echo "XCODE_CHANNEL must be 'Stable' (not '$XCODE_CHANNEL') when XCODE_IS_STABLE=$XCODE_IS_STABLE (and XCODE_IS_PREVIEW=$XCODE_IS_PREVIEW)"
# exit 1
# fi
# else
# echo "Unexpected values for XCODE_IS_STABLE ($XCODE_IS_STABLE) and XCODE_IS_PREVIEW ($XCODE_IS_PREVIEW): must be either 'true' or 'false', and not equal to eachother."
# exit 1
# fi

echo "The current Xcode channel ('$XCODE_CHANNEL') is correct."
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ parameters:
- name: macOSName # comes from the build agent demand named macOS.Name
displayName: Name of the version of macOS to use
type: string
default: 'Sequoia'
default: 'Tahoe'

- name: pool
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ parameters:
- name: macOSName # comes from the build agent demand named macOS.Name
displayName: Name of the version of macOS to use
type: string
default: 'Sequoia'
default: 'Tahoe'

- name: pool
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ parameters:
- name: macOSName # comes from the build agent demand named macOS.Name
displayName: Name of the version of macOS to use
type: string
default: 'Sequoia'
default: 'Tahoe'

- name: runTests
displayName: Run Simulator Tests
Expand Down
2 changes: 1 addition & 1 deletion tools/devops/automation/templates/variables/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ variables:
value: 15.6

- name: xcodeChannel
value: Stable
value: Beta
Loading