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

Move pipeline to run with Xcode 16 on MacOS 14 #2456

Merged
merged 14 commits into from
Jan 3, 2025
Merged

Move pipeline to run with Xcode 16 on MacOS 14 #2456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
be4b9b0
submodule update
Dec 13, 2024
e877c6c
more log
Dec 13, 2024
3029224
upgrade to Xcode 16
Dec 13, 2024
0345fb6
submodule update
Dec 13, 2024
8ed1cfe
update native auth xcode version
Dec 13, 2024
d8cc0de
switch to arm
Dec 13, 2024
0c3734e
disable pod related task in automation
Dec 13, 2024
95486d2
dummy try
kaisong1990 Dec 14, 2024
52caa23
Revert back
kaisong1990 Dec 14, 2024
1fd5310
Add image info
kaisong1990 Dec 14, 2024
fe20e91
Spetrescu/test macos 14 (#2447)
kaisong1990 Dec 19, 2024
4cc9842
[iOS SDK] Skip E2E tests that don't work on macOS (#2450)
spetrescu84 Dec 20, 2024
c765b9e
Test skip reason updated (#2451)
spetrescu84 Dec 20, 2024
ec24d28
Merge branch 'dev' into kasong/more-logs
Dec 23, 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
9 changes: 9 additions & 0 deletions ...est/integration/native_auth/end_to_end/mfa/MSALNativeAuthSignInWithMFAEndToEndTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ import MSAL
final class MSALNativeAuthSignInWithMFAEndToEndTests: MSALNativeAuthEndToEndPasswordTestCase {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request does not update CHANGELOG.md.

Please consider if this change would be noticeable to a partner or user and either update CHANGELOG.md or resolve this conversation.


func test_signInUsingPasswordWithMFASubmitWrongChallengeResendChallengeThen_completeSuccessfully() async throws {
#if os(macOS)
throw XCTSkip("For some reason this test now requires Keychain access, reason needs to be investigated")
#endif
guard let username = retrieveUsernameForSignInUsernamePasswordAndMFA(),
let password = await retrievePasswordForSignInUsername(),
let awaitingMFAState = await signInUsernameAndPassword(username: username, password: password)
Expand Down Expand Up @@ -85,6 +88,9 @@ final class MSALNativeAuthSignInWithMFAEndToEndTests: MSALNativeAuthEndToEndPass
}

func test_signInUsingPasswordWithMFAGetAuthMethods_thenCompleteSuccessfully() async throws {
#if os(macOS)
throw XCTSkip("For some reason this test now requires Keychain access, reason needs to be investigated")
#endif
guard let username = retrieveUsernameForSignInUsernamePasswordAndMFA(),
let password = await retrievePasswordForSignInUsername(),
let awaitingMFAState = await signInUsernameAndPassword(username: username, password: password)
Expand Down Expand Up @@ -140,6 +146,9 @@ final class MSALNativeAuthSignInWithMFAEndToEndTests: MSALNativeAuthEndToEndPass
}

func test_signInUsingPasswordWithMFANoDefaultAuthMethod_completeSuccessfully() async throws {
#if os(macOS)
throw XCTSkip("For some reason this test now requires Keychain access, reason needs to be investigated")
#endif
guard let username = retrieveUsernameForSignInUsernamePasswordAndMFANoDefaultAuthMethod(),
let password = await retrievePasswordForSignInUsername(),
let awaitingMFAState = await signInUsernameAndPassword(username: username, password: password)
Expand Down
3 changes: 3 additions & 0 deletions ...native_auth/end_to_end/sign_in/MSALNativeAuthSignInUserNameAndPasswordEndToEndTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ final class MSALNativeAuthSignInUsernameAndPasswordEndToEndTests: MSALNativeAuth

// Hero Scenario 1.2.1. Sign in - Use email and password to get token
func test_signInUsingPasswordWithKnownUsernameResultsInSuccess() async throws {
#if os(macOS)
throw XCTSkip("For some reason this test now requires Keychain access, reason needs to be investigated")
#endif
guard let sut = initialisePublicClientApplication(), let username = retrieveUsernameForSignInUsernameAndPassword(), let password = await retrievePasswordForSignInUsername() else {
XCTFail("Missing information")
return
Expand Down
10 changes: 7 additions & 3 deletions azure_pipelines/automation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ jobs:
clean: all

steps:
- script: |
system_profiler SPHardwareDataType | grep "Processor Name"
displayName: 'Check System Information'
- template: templates/tests-with-conf-file.yml

- task: UsePythonVersion@0
Expand Down Expand Up @@ -90,8 +94,8 @@ jobs:
- template: templates/tests-with-conf-file.yml
parameters:
schema: 'MSAL iOS Native Auth E2E Tests'
full_path: 'build/Build/Products/MSAL iOS Native Auth E2E Tests_MSAL iOS Native Auth E2E Tests_iphonesimulator17.5-x86_64.xctestrun'
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.5'
full_path: 'build/Build/Products/MSAL iOS Native Auth E2E Tests_MSAL iOS Native Auth E2E Tests_iphonesimulator18.1-x86_64.xctestrun'
destination: 'platform=iOS Simulator,name=iPhone 16,OS=18.1'
sdk: 'iphonesimulator'
retry_tests: false

Expand All @@ -106,7 +110,7 @@ jobs:
- template: templates/tests-with-conf-file.yml
parameters:
schema: 'MSAL Mac Native Auth E2E Tests'
full_path: 'build/Build/Products/MSAL Mac Native Auth E2E Tests_MSAL Mac Native Auth E2E Tests_macosx14.5-x86_64.xctestrun'
full_path: 'build/Build/Products/MSAL Mac Native Auth E2E Tests_MSAL Mac Native Auth E2E Tests_macosx15.1-x86_64.xctestrun'
destination: 'platform=macOS'
sdk: 'macosx'
retry_tests: false
Expand Down
6 changes: 3 additions & 3 deletions azure_pipelines/pr-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ jobs:
- template: templates/tests-with-conf-file.yml
parameters:
schema: 'MSAL iOS Native Auth E2E Tests'
full_path: 'build/Build/Products/MSAL iOS Native Auth E2E Tests_MSAL iOS Native Auth E2E Tests_iphonesimulator17.5-x86_64.xctestrun'
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.5'
full_path: 'build/Build/Products/MSAL iOS Native Auth E2E Tests_MSAL iOS Native Auth E2E Tests_iphonesimulator18.1-x86_64.xctestrun'
destination: 'platform=iOS Simulator,name=iPhone 16,OS=18.1'
sdk: 'iphonesimulator'
retry_tests: false

Expand All @@ -191,7 +191,7 @@ jobs:
- template: templates/tests-with-conf-file.yml
parameters:
schema: 'MSAL Mac Native Auth E2E Tests'
full_path: 'build/Build/Products/MSAL Mac Native Auth E2E Tests_MSAL Mac Native Auth E2E Tests_macosx14.5-x86_64.xctestrun'
full_path: 'build/Build/Products/MSAL Mac Native Auth E2E Tests_MSAL Mac Native Auth E2E Tests_macosx15.1-x86_64.xctestrun'
destination: 'platform=macOS'
sdk: 'macosx'
retry_tests: false
Expand Down
8 changes: 4 additions & 4 deletions azure_pipelines/templates/tests-with-conf-file.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
schema: 'MSAL Test Automation (iOS)'
full_path: 'build/Build/Products/MSAL Test Automation (iOS)_iphonesimulator17.5-x86_64.xctestrun'
destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.5'
full_path: 'build/Build/Products/MSAL Test Automation (iOS)_iphonesimulator18.1-x86_64.xctestrun'
destination: 'platform=iOS Simulator,name=iPhone 16,OS=18.1'
sdk: 'iphonesimulator'
retry_tests: true

Expand All @@ -17,7 +17,7 @@ steps:
displayName: 'Select Xcode version'
inputs:
targetType: 'inline'
script: '/bin/bash -c "sudo xcode-select -s /Applications/Xcode_15.4.app"'
script: '/bin/bash -c "sudo xcode-select -s /Applications/Xcode_16.1.app"'

- task: Bash@3
displayName: Go to project folder
Expand Down Expand Up @@ -84,4 +84,4 @@ steps:
targetPath: '$(Agent.BuildDirectory)/s/test_output/'
artifactName: 'TestOutputs Attempt - $(System.StageAttempt) - ${{ parameters.schema }}'
publishLocation: 'pipeline'


Loading