Skip to content

Commit ab51eb6

Browse files
committed
Merge branch 'dev' into antonioalwan/17_handle_account_removed_artifacts
* dev: Mac changes Fix OneAuth pipeline
2 parents cc41a3e + ff48718 commit ab51eb6

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

azure_pipelines/verify_msalcpp_per_pr_ios.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ variables:
1717

1818
resources:
1919
repositories:
20-
- repository: microsoft-authentication-library-for-cpp
21-
type: github
22-
endpoint: 'PipelineConnectionCPP'
23-
name: AzureAD/microsoft-authentication-library-for-cpp
24-
ref: develop
20+
- repository: OneAuth
21+
type: git
22+
endpoint: 'OfficeADO'
23+
name: OneAuth/OneAuth
24+
ref: dev
2525

2626
jobs:
2727
- job: iOS_OnPrCommit
28-
displayName: MSAL CPP checks per commit for iOS
28+
displayName: OneAuth checks per commit for iOS
2929
timeoutInMinutes: 40
3030
cancelTimeoutInMinutes: 1
3131
workspace:
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- checkout: self
3636
path: CommonCore
37-
- checkout: microsoft-authentication-library-for-cpp
37+
- checkout: OneAuth
3838
path: s
3939

4040
- task: UsePythonVersion@0
@@ -47,21 +47,21 @@ jobs:
4747
- task: PythonScript@0
4848
displayName: Update subtree and rename files
4949
inputs:
50-
scriptPath: scripts/update_msalobjc_subtree.py
50+
scriptPath: msal/scripts/update_msalobjc_subtree.py
5151
arguments: '--skip-checkout --msal-common-repo $(Agent.BuildDirectory)/CommonCore --remote-ref $(commit_number)'
5252

5353
- task: UsePythonVersion@0
5454
displayName: 'Switch to use Xcode 15.4'
5555
- script: |
5656
/bin/bash -c "sudo xcode-select -s /Applications/Xcode_15.4.app"
5757
58-
- template: azure_pipelines/templates/ios-setup.yml@microsoft-authentication-library-for-cpp
58+
- template: msal/azure_pipelines/templates/ios-setup.yml@OneAuth
5959

6060
- task: PythonScript@0
6161
name: Build
6262
displayName: 'Build x64 Debug iOS'
6363
inputs:
64-
scriptPath: build.py
64+
scriptPath: msal/build.py
6565
arguments: '--clean --arch x64 --configuration Debug --platform iOS --djinni hashfail --test --test-type unit integration --build-projects tests'
6666
env:
6767
MSAL_LAB_VAULT_ACCESS_CERT_LOCATION: $(Agent.TempDirectory)

azure_pipelines/verify_msalcpp_per_pr_mac.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ variables:
1717

1818
resources:
1919
repositories:
20-
- repository: microsoft-authentication-library-for-cpp
21-
type: github
22-
endpoint: 'PipelineConnectionCPP'
23-
name: AzureAD/microsoft-authentication-library-for-cpp
24-
ref: develop
20+
- repository: OneAuth
21+
type: git
22+
endpoint: 'OfficeADO'
23+
name: OneAuth/OneAuth
24+
ref: dev
2525

2626
jobs:
2727
- job: macOS_OnPrCommit
28-
displayName: MSAL CPP checks per commit for macOS
28+
displayName: OneAuth checks per commit for macOS
2929
timeoutInMinutes: 40
3030
cancelTimeoutInMinutes: 1
3131
workspace:
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- checkout: self
3636
path: CommonCore
37-
- checkout: microsoft-authentication-library-for-cpp
37+
- checkout: OneAuth
3838
path: s
3939

4040
- task: UsePythonVersion@0
@@ -48,21 +48,21 @@ jobs:
4848
- task: PythonScript@0
4949
displayName: Update subtree and rename files
5050
inputs:
51-
scriptPath: scripts/update_msalobjc_subtree.py
51+
scriptPath: msal/scripts/update_msalobjc_subtree.py
5252
arguments: '--skip-checkout --msal-common-repo $(Agent.BuildDirectory)/CommonCore --remote-ref $(commit_number)'
5353

5454
- task: UsePythonVersion@0
5555
displayName: 'Switch to use Xcode 15.4'
5656
- script: |
5757
/bin/bash -c "sudo xcode-select -s /Applications/Xcode_15.4.app"
5858
59-
- template: azure_pipelines/templates/macos-setup.yml@microsoft-authentication-library-for-cpp
59+
- template: msal/azure_pipelines/templates/macos-setup.yml@OneAuth
6060

6161
- task: PythonScript@0
6262
name: Build
6363
displayName: 'Build x64 Debug macOS'
6464
inputs:
65-
scriptPath: build.py
65+
scriptPath: msal/build.py
6666
arguments: '--clean --arch x64 --configuration Debug --platform macOS --djinni hashfail --test --test-type unit integration --build-projects tests'
6767
env:
6868
MSAL_LAB_VAULT_ACCESS_CERT_LOCATION: $(Agent.TempDirectory)

0 commit comments

Comments
 (0)