[CI] Use MacOS for x86_64 and arm64 (#158)

elastic · Mar 9, 2021 · 7eca302 · 7eca302
1 parent 6a90009
commit 7eca302
Showing 1 changed file with 29 additions and 3 deletions.
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -47,17 +47,43 @@ pipeline {
  matrix {
  agent {label "${PLATFORM}"}
  axes {
+ axis {
+ name 'GO_VERSION'
+ values '1.15.8', '1.16'
+ }
  axis {
  name 'PLATFORM'
- values 'macosx', 'ubuntu-20 && immutable', 'windows-2012-r2 && windows-immutable'
+ values 'macosx&&x86_64', 'macosx&&arm64', 'ubuntu-20 && immutable', 'windows-2012-r2 && windows-immutable'
+ }
+ }
+ excludes {
+ exclude {
+ axis {
+ name 'GO_VERSION'
+ values '1.15.8'
+ }
+ axis {
+ name 'PLATFORM'
+ values 'macosx&&arm64'
+ }
+ }
+ exclude {
+ axis {
+ name 'GO_VERSION'
+ values '1.16'
+ }
+ axis {
+ name 'PLATFORM'
+ notValues 'macosx&&arm64'
+ }
  }
  }
  stages {
  stage('build'){
  steps {
  deleteDir()
  unstash 'source'
- withGoEnv(){
+ withGoEnv(version: env.GO_VERSION){
  dir("${BASE_DIR}"){
  cmd(label: 'Go build', script: 'go build')
  }
@@ -66,7 +92,7 @@ pipeline {
  }
  stage('test'){
  steps {
- withGoEnv(){
+ withGoEnv(version: env.GO_VERSION){
  dir("${BASE_DIR}"){
  goTestJUnit(options: '-v ./...', output: 'junit-report.xml')
  buildExamples()