Skip to content

Commit 1ff020c

Browse files
committed
Merge from dev
2 parents 5dbb967 + cf92f1e commit 1ff020c

File tree

3 files changed

+36
-9
lines changed

3 files changed

+36
-9
lines changed

MSAL/MSAL.xcodeproj/project.pbxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,6 @@
808808
B29E2AE321238FBE00B170ED /* NSDictionary+MSALiOSUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = B2BB738A2112C3F2000EA4C5 /* NSDictionary+MSALiOSUITests.m */; };
809809
B29E2AE521238FBE00B170ED /* XCUIElement+MSALiOSUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = B2BB738B2112C3F2000EA4C5 /* XCUIElement+MSALiOSUITests.m */; };
810810
B2A1C33D21C6FBAF00DDAE8E /* MSALAADMultiUserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B2F4571D2116B26C00818910 /* MSALAADMultiUserTests.m */; };
811-
B2A1C33F21C7038D00DDAE8E /* MSALADFSv3FederatedTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B21F9DE52120E53A00B1B40C /* MSALADFSv3FederatedTests.m */; };
812811
B2A3C2892145FD0F0082525C /* MSALAccountsProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A3C2872145FD0F0082525C /* MSALAccountsProvider.h */; };
813812
B2A3C28A2145FD0F0082525C /* MSALAccountsProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A3C2872145FD0F0082525C /* MSALAccountsProvider.h */; };
814813
B2A3C28B2145FD0F0082525C /* MSALAccountsProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = B2A3C2882145FD0F0082525C /* MSALAccountsProvider.m */; };
@@ -6513,7 +6512,6 @@
65136512
B282256223EF9BFF0007DFE4 /* MSALChinaCloudUITests.m in Sources */,
65146513
B2D0A38A21C70AF50071E0DA /* MSALPingUITests.m in Sources */,
65156514
B2BB73912112C3F3000EA4C5 /* XCUIElement+MSALiOSUITests.m in Sources */,
6516-
B2A1C33F21C7038D00DDAE8E /* MSALADFSv3FederatedTests.m in Sources */,
65176515
B2F4572A211C0B4800818910 /* MSALBaseAADUITest.m in Sources */,
65186516
B282255C23EF811F0007DFE4 /* MSALB2CInteractiveTests.m in Sources */,
65196517
B2BB73732112C32C000EA4C5 /* MSALAADBasicInteractiveTests.m in Sources */,

azure_pipelines/broker_submodule_check.yml

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ resources:
3232

3333
jobs:
3434
- job: 'Validate_Pull_Request'
35+
strategy:
36+
maxParallel: 3
37+
matrix:
38+
IOS_LIB:
39+
target: "ios_library"
40+
MAC_LIB:
41+
target: "mac_library"
42+
VISION_LIB:
43+
target: "vision_library"
3544
displayName: Validate Pull Request
3645
pool:
3746
vmImage: 'macOS-14'
@@ -145,11 +154,15 @@ jobs:
145154
inputs:
146155
targetType: 'inline'
147156
script: |
148-
echo "Downloading simulator for visionOS"
149-
sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer
150-
defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES
151-
defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES
152-
xcodebuild -downloadPlatform visionOS
157+
if [ $(target) == 'vision_library' ]; then
158+
echo "Downloading simulator for visionOS"
159+
sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer
160+
defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES
161+
defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES
162+
xcodebuild -downloadPlatform visionOS
163+
else
164+
echo "Not visionOS job, no download needed"
165+
fi
153166
failOnStderr: false
154167

155168

@@ -160,5 +173,21 @@ jobs:
160173
script: |
161174
cd azure-activedirectory-tokenbroker-for-objc
162175
echo "executing build:./build.py"
163-
python3 ./build.py
176+
{ output=$(./build.py --show-build-settings --target $(target) 2>&1 1>&3-) ;} 3>&1
177+
final_status=$(<./build/status.txt)
178+
echo "FINAL STATUS = ${final_status}"
179+
echo "POSSIBLE ERRORS: ${output}"
180+
181+
if [ $final_status != "0" ]; then
182+
echo "Build & Testing Failed! \n ${output}" >&2
183+
fi
184+
failOnStderr: true
185+
186+
- task: Bash@3
187+
condition: always()
188+
displayName: Cleanup
189+
inputs:
190+
targetType: 'inline'
191+
script: |
192+
rm -rf ./build/status.txt
164193

0 commit comments

Comments
 (0)