Skip to content

Commit 6478850

Browse files
authored
Merge branch 'dev' into readme
2 parents bd46e99 + 4821f95 commit 6478850

File tree

68 files changed

+1617
-1598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1617
-1598
lines changed

azure-pipelines/pull-request-validation/pr-msal.yml

Lines changed: 73 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ name: $(date:yyyyMMdd)$(rev:.r)
77

88
variables:
99
- name: BuildParameters.jdkVersion
10-
value: 1.8
10+
value: 1.11
1111
- name: BuildParameters.jdkArchitecture
1212
value: x64
1313
- name: BuildParameters.javaHomeSelection
1414
value: JDKVersion
1515
- name: robolectricSdkVersion
16-
value: 28
16+
value: 33
1717

1818
trigger:
1919
branches:
@@ -31,40 +31,104 @@ resources:
3131
ref: dev
3232
endpoint: ANDROID_GITHUB
3333

34+
pool:
35+
name: Hosted Windows 2019 with VS2019
3436
jobs:
3537
- job: build_test
3638
displayName: Build & Test
3739
cancelTimeoutInMinutes: 1
38-
pool:
39-
name: Hosted Windows 2019 with VS2019
4040
steps:
4141
- checkout: self
4242
clean: true
4343
submodules: recursive
4444
persistCredentials: True
4545
- template: azure-pipelines/templates/steps/automation-cert.yml@common
4646
- task: JavaToolInstaller@0
47-
displayName: Use Java 8
47+
displayName: Use Java 11
4848
inputs:
49+
versionSpec: '11'
4950
jdkArchitectureOption: x64
5051
jdkSourceOption: PreInstalled
5152
- task: Gradle@2
5253
name: Gradle1
53-
displayName: Assemble Release
54+
displayName: Assemble Local
5455
inputs:
5556
tasks: clean msal:assembleLocal
5657
publishJUnitResults: false
5758
testResultsFiles: '**/build/test-results/TEST-*.xml'
5859
jdkVersion: $(BuildParameters.jdkVersion)
5960
jdkArchitecture: $(BuildParameters.jdkArchitecture)
6061
sqGradlePluginVersion: 2.0.1
61-
- template: azure-pipelines/templates/steps/spotbugs.yml@common
62-
parameters:
63-
project: msal
6462
- task: Gradle@2
6563
displayName: Run Unit tests
6664
inputs:
6765
tasks: msal:testLocalDebugUnitTest -Plabtest -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}}
6866
javaHomeSelection: $(BuildParameters.javaHomeSelection)
6967
jdkVersion: 1.11
68+
- job: spotbugs
69+
displayName: SpotBugs
70+
cancelTimeoutInMinutes: 1
71+
steps:
72+
- checkout: self
73+
clean: true
74+
submodules: recursive
75+
persistCredentials: True
76+
- template: azure-pipelines/templates/steps/spotbugs.yml@common
77+
parameters:
78+
project: msal
79+
- job: lint
80+
displayName: Lint
81+
cancelTimeoutInMinutes: 1
82+
steps:
83+
- checkout: self
84+
clean: true
85+
submodules: recursive
86+
persistCredentials: True
87+
- task: CmdLine@1
88+
displayName: Set Office MVN Access Token in Environment
89+
inputs:
90+
filename: echo
91+
arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROID_MSAL_ACCESSTOKEN]$(System.AccessToken)'
92+
- task: Gradle@3
93+
displayName: Lint Local debug
94+
inputs:
95+
tasks: clean msal:lintLocalDebug
96+
publishJUnitResults: false
97+
jdkVersion: 1.11
98+
- job: codeql
99+
displayName: CodeQL
100+
cancelTimeoutInMinutes: 1
101+
steps:
102+
- checkout: self
103+
clean: true
104+
submodules: recursive
105+
persistCredentials: True
106+
- task: JavaToolInstaller@0
107+
displayName: Use Java 11
108+
inputs:
109+
versionSpec: '11'
110+
jdkArchitectureOption: x64
111+
jdkSourceOption: PreInstalled
112+
- task: CmdLine@1
113+
displayName: Set Office MVN Access Token in Environment
114+
inputs:
115+
filename: echo
116+
arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROID_MSAL_ACCESSTOKEN]$(System.AccessToken)'
117+
# https://semmleportal.azurewebsites.net/codeql/guardian
118+
- task: Semmle@1
119+
env:
120+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
121+
inputs:
122+
sourceCodeDirectory: '$(Build.SourcesDirectory)'
123+
language: 'java'
124+
buildCommandsString: 'gradlew.bat clean msal:assembleLocal'
125+
querySuite: 'Recommended'
126+
timeout: '1800'
127+
- task: PublishPipelineArtifact@1
128+
displayName: 'Publish code analysis artifacts'
129+
inputs:
130+
targetPath: '$(Build.SourcesDirectory)\build\outputs\'
131+
ArtifactName: 'outputs'
132+
condition: failed()
133+
70134
...

azure-pipelines/ui-automation/msal-broker-BrokerHost-nightly.yml

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)