Skip to content

Commit ff5e95e

Browse files
committed
fixed common core checkout script and added openssl changes from wpj submodule check
1 parent e776126 commit ff5e95e

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

azure_pipelines/broker_submodule_check.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ jobs:
6161
script: |
6262
cd azure-activedirectory-tokenbroker-for-objc
6363
git submodule update --init --recursive ADAuthenticationBroker/Frameworks/adal
64-
git submodule update --init ADAuthenticationBroker/Frameworks/microsoft-authentication-library-for-objc/MSAL/IdentityCore
64+
cd ADAuthenticationBroker/Frameworks/microsoft-authentication-library-for-objc
65+
git submodule update --init --recursive
6566
6667
- checkout: WorkplaceJoin-for-iOS
6768
displayName: 'Checkout WPJ'
@@ -106,22 +107,16 @@ jobs:
106107
workingDirectory: $(Pipeline.Workspace)/s
107108
targetType: 'inline'
108109
script: |
109-
cd azure-activedirectory-tokenbroker-for-objc
110-
REV=$(git rev-parse HEAD:ADAuthenticationBroker/Frameworks/WorkplaceJoin-for-iOS)
111-
cd ADAuthenticationBroker/Frameworks/WorkplaceJoin-for-iOS
112-
git pull origin $REV
113-
cd Frameworks
114-
git -c http.https://msazure.visualstudio.com/DefaultCollection/PlatformCrypto/_git/openssl-msft.extraheader="AUTHORIZATION: bearer $(aadToken)" submodule update --init openssl-msft
110+
cd azure-activedirectory-tokenbroker-for-objc/ADAuthenticationBroker/Frameworks/WorkplaceJoin-for-iOS
111+
git -c http.https://msazure.visualstudio.com/DefaultCollection/PlatformCrypto/_git/openssl-msft.extraheader="AUTHORIZATION: bearer $(aadToken)" submodule update --init Frameworks/openssl-msft
115112
116113
- task: Bash@3
117114
displayName: 'Update WPJ submodules'
118115
inputs:
119116
workingDirectory: $(Pipeline.Workspace)/s
120117
targetType: 'inline'
121118
script: |
122-
cd azure-activedirectory-tokenbroker-for-objc
123-
cd ADAuthenticationBroker/Frameworks/WorkplaceJoin-for-iOS
124-
git submodule update --init --recursive
119+
git submodule update --init --recursive Frameworks/microsoft-authentication-library-for-objc
125120
126121
- script: 'gem uninstall xcpretty -I --version 0.4.0'
127122
displayName: 'Uninstall xcpretty v0.4.0'

azure_pipelines/pr-validation.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ jobs:
6161
script: |
6262
cd azure-activedirectory-tokenbroker-for-objc
6363
git submodule update --init --recursive ADAuthenticationBroker/Frameworks/adal
64-
git submodule update --init ADAuthenticationBroker/Frameworks/microsoft-authentication-library-for-objc/MSAL/IdentityCore
64+
cd ADAuthenticationBroker/Frameworks/microsoft-authentication-library-for-objc
65+
git submodule update --init --recursive
6566
6667
- checkout: WorkplaceJoin-for-iOS
6768
displayName: 'Checkout WPJ'
@@ -106,22 +107,16 @@ jobs:
106107
workingDirectory: $(Pipeline.Workspace)/s
107108
targetType: 'inline'
108109
script: |
109-
cd azure-activedirectory-tokenbroker-for-objc
110-
REV=$(git rev-parse HEAD:ADAuthenticationBroker/Frameworks/WorkplaceJoin-for-iOS)
111-
cd ADAuthenticationBroker/Frameworks/WorkplaceJoin-for-iOS
112-
git pull origin $REV
113-
cd Frameworks
114-
git -c http.https://msazure.visualstudio.com/DefaultCollection/PlatformCrypto/_git/openssl-msft.extraheader="AUTHORIZATION: bearer $(aadToken)" submodule update --init openssl-msft
110+
cd azure-activedirectory-tokenbroker-for-objc/ADAuthenticationBroker/Frameworks/WorkplaceJoin-for-iOS
111+
git -c http.https://msazure.visualstudio.com/DefaultCollection/PlatformCrypto/_git/openssl-msft.extraheader="AUTHORIZATION: bearer $(aadToken)" submodule update --init Frameworks/openssl-msft
115112
116113
- task: Bash@3
117114
displayName: 'Update WPJ submodules'
118115
inputs:
119116
workingDirectory: $(Pipeline.Workspace)/s
120117
targetType: 'inline'
121118
script: |
122-
cd azure-activedirectory-tokenbroker-for-objc
123-
cd ADAuthenticationBroker/Frameworks/WorkplaceJoin-for-iOS
124-
git submodule update --init --recursive
119+
git submodule update --init --recursive Frameworks/microsoft-authentication-library-for-objc
125120
126121
- script: 'gem uninstall xcpretty -I --version 0.4.0'
127122
displayName: 'Uninstall xcpretty v0.4.0'

0 commit comments

Comments
 (0)