Fix Android CI build issues (#587)
* Update JDK version to 17 in ci.yml * Update com.diffplug.spotless to 6.22.0. * Update to JDK 17 in packaging pipelines. * Fix pool name.
This commit is contained in:
Родитель
646962072d
Коммит
2aeca72714
|
@ -17,9 +17,9 @@ jobs:
|
|||
displayName: "Use Python 3.9"
|
||||
|
||||
- task: JavaToolInstaller@0
|
||||
displayName: Use jdk 11
|
||||
displayName: Use jdk 17
|
||||
inputs:
|
||||
versionSpec: "11"
|
||||
versionSpec: "17"
|
||||
jdkArchitectureOption: "x64"
|
||||
jdkSourceOption: "PreInstalled"
|
||||
|
||||
|
|
|
@ -512,9 +512,9 @@ stages:
|
|||
displayName: "Use Python 3.9"
|
||||
|
||||
- task: JavaToolInstaller@0
|
||||
displayName: Use jdk 11
|
||||
displayName: Use jdk 17
|
||||
inputs:
|
||||
versionSpec: '11'
|
||||
versionSpec: '17'
|
||||
jdkArchitectureOption: 'x64'
|
||||
jdkSourceOption: 'PreInstalled'
|
||||
|
||||
|
@ -561,9 +561,9 @@ stages:
|
|||
displayName: "Use Python 3.9"
|
||||
|
||||
- task: JavaToolInstaller@0
|
||||
displayName: Use jdk 11
|
||||
displayName: Use jdk 17
|
||||
inputs:
|
||||
versionSpec: '11'
|
||||
versionSpec: '17'
|
||||
jdkArchitectureOption: 'x64'
|
||||
jdkSourceOption: 'PreInstalled'
|
||||
|
||||
|
|
|
@ -34,9 +34,9 @@ jobs:
|
|||
displayName: "Use Python 3.9"
|
||||
|
||||
- task: JavaToolInstaller@0
|
||||
displayName: Use jdk 11
|
||||
displayName: Use jdk 17
|
||||
inputs:
|
||||
versionSpec: "11"
|
||||
versionSpec: "17"
|
||||
jdkArchitectureOption: "x64"
|
||||
jdkSourceOption: "PreInstalled"
|
||||
|
||||
|
|
|
@ -52,9 +52,9 @@ stages:
|
|||
architecture: "x64"
|
||||
displayName: "Use Python 3.9"
|
||||
- task: JavaToolInstaller@0
|
||||
displayName: Use jdk 11
|
||||
displayName: Use jdk 17
|
||||
inputs:
|
||||
versionSpec: "11"
|
||||
versionSpec: "17"
|
||||
jdkArchitectureOption: "x64"
|
||||
jdkSourceOption: "PreInstalled"
|
||||
- task: DownloadPipelineArtifact@2
|
||||
|
|
|
@ -55,7 +55,7 @@ stages:
|
|||
- template: build-package-for-linux.yml
|
||||
parameters:
|
||||
OrtExtensionsArch: 'aarch64'
|
||||
PoolName: 'aiinfra-linux-ARM64-CPU-2019'
|
||||
PoolName: 'onnxruntime-linux-ARM64-CPU-2019'
|
||||
IsReleaseBuild: ${{parameters.IsReleaseBuild}}
|
||||
OrtExtensionsCFlags: ''
|
||||
OrtExtensionsCXXFlags: ''
|
||||
|
|
|
@ -3,7 +3,7 @@ plugins {
|
|||
id 'maven-publish'
|
||||
id 'signing'
|
||||
id 'jacoco'
|
||||
id 'com.diffplug.spotless' version '5.17.0'
|
||||
id 'com.diffplug.spotless' version '6.22.0'
|
||||
}
|
||||
|
||||
allprojects {
|
||||
|
|
Загрузка…
Ссылка в новой задаче