Skip to content

Commit 09b75e8

Browse files
committed
Merge branch 'mipetriu/visionOS_combined_target' into mipetriu/visionOS_configs_tests
merge main visionOS branch to testing branch
2 parents b0c470f + 825dc59 commit 09b75e8

File tree

4 files changed

+65
-2
lines changed

4 files changed

+65
-2
lines changed

CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
/MSAL/MSAL.xcodeproj/project.pbxproj @AzureAD/AppleIdentityTeam @AzureAD/MSAL-ObjC-CIAM
77
CHANGELOG.md @AzureAD/AppleIdentityTeam @AzureAD/MSAL-ObjC-CIAM
88
# @AzureAD/MSAL-ObjC-CIAM owns any files in the */native_auth
9-
# directories, subdirectories and the module.modulemap file.
9+
# directories, subdirectories and other files related to native auth.
1010
/MSAL/module.modulemap @AzureAD/MSAL-ObjC-CIAM
11+
/MSAL/.swiftlint.yml @AzureAD/MSAL-ObjC-CIAM
1112
/MSAL/src/native_auth/ @AzureAD/MSAL-ObjC-CIAM
1213
/MSAL/test/unit/native_auth/ @AzureAD/MSAL-ObjC-CIAM
1314
/MSAL/test/integration/native_auth/ @AzureAD/MSAL-ObjC-CIAM

MSAL/IdentityCore

azure_pipelines/automation.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,19 @@ jobs:
7979
issue_body = '''@AzureAD/appleidentity \nAutomation failed for [$(repositoryName)]({0}) ran against commit : {1} \n Pipeline URL : [{2}]({2})'''.format('$(Build.Repository.Uri)', git_commit, pipeline_uri)
8080
github.create_issue(github_org, repo, issue_title, issue_body, labels=['automation failure'])
8181
82+
- job: e2e_test_native_auth
83+
displayName: 'Run MSAL E2E tests for native auth'
84+
timeoutInMinutes: 30
85+
cancelTimeoutInMinutes: 5
86+
workspace:
87+
clean: all
88+
89+
steps:
90+
- template: templates/tests-with-conf-file.yml
91+
parameters:
92+
schema: 'MSAL iOS Native Auth E2E Tests'
93+
build: 'MSAL iOS Native Auth E2E Tests_MSAL iOS Native Auth E2E Tests'
94+
8295
- job: cocoapods_lib_lint
8396
displayName: Run Cocoapods lib lint
8497
timeoutInMinutes: 30

azure_pipelines/pr-validation.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,55 @@ jobs:
105105
failTaskOnFailedTests: true
106106
testRunTitle: 'Test Run - $(target)'
107107

108+
- job: fetch_pr_labels
109+
displayName: 'Check for PR Label'
110+
timeoutInMinutes: 5
111+
pool:
112+
vmImage: 'macOS-14'
113+
steps:
114+
- script: |
115+
url="https://api.github.com/repos/$BUILD_REPOSITORY_ID/issues/$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER/labels"
116+
117+
echo "Fetching labels from $url "
118+
119+
# Temporary file to store the raw response
120+
temp_file=$(mktemp)
121+
122+
# Store the response code and the raw response in separate variables
123+
response_code=$(curl -s -w "%{http_code}" -o "$temp_file" "$url")
124+
response_content=$(cat "$temp_file")
125+
126+
echo "Response code: $response_code"
127+
echo "Raw response: $response_content"
128+
129+
if [[ "$response_code" -eq 200 ]]; then
130+
label_names=$(echo $response_content | jq -r '.[].name' | paste -sd ', ' -)
131+
echo "##vso[task.setvariable variable=PR_LABELS;isOutput=true]$label_names"
132+
[ -z "$label_names" ] && echo "PR labels: <empty>" || echo "PR labels: $label_names"
133+
else
134+
echo "Request failed with status code: $response_code - Skipping Native Auth E2E tests as a preventive measure"
135+
echo "##vso[task.setvariable variable=PR_LABELS;isOutput=true]'skip-native-auth-e2e-tests'"
136+
fi
137+
138+
name: fetchPrLabels
139+
140+
- job: e2e_test_native_auth
141+
displayName: 'Run MSAL E2E tests for native auth'
142+
dependsOn: fetch_pr_labels
143+
condition: and( succeeded(), not(contains(dependencies.fetch_pr_labels.outputs['fetchPrLabels.PR_LABELS'], 'skip-native-auth-e2e-tests')) )
144+
timeoutInMinutes: 30
145+
cancelTimeoutInMinutes: 5
146+
pool:
147+
vmImage: 'macOS-14'
148+
workspace:
149+
clean: all
150+
151+
steps:
152+
- template: templates/tests-with-conf-file.yml
153+
parameters:
154+
schema: 'MSAL iOS Native Auth E2E Tests'
155+
build: 'MSAL iOS Native Auth E2E Tests_MSAL iOS Native Auth E2E Tests'
156+
108157
- job: 'Validate_SPM_Integration'
109158
displayName: Validate SPM Integration
110159
pool:

0 commit comments

Comments
 (0)