Skip to content
This repository has been archived by the owner on Jan 15, 2021. It is now read-only.

Updating library versions #170

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updating library versions #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0be6f0c
Updating library versions
pjreiniger May 16, 2020
22eb4ac
Fixing azure, running formatter
pjreiniger May 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
324 changes: 156 additions & 168 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

resources:
containers:
- container: wpilib2019
image: wpilib/roborio-cross-ubuntu:2019-18.04
- container: wpilib2020
image: wpilib/roborio-cross-ubuntu:2020-18.04
- container: ubuntu18
image: ubuntu:18.04
options: "--name ci-container -v /usr/bin/docker:/tmp/docker:ro"
Expand Down Expand Up @@ -42,178 +42,166 @@ stages:
# displayName: 'Check wpiformat Output'


- job: Linux
pool:
vmImage: 'Ubuntu 16.04'

container: wpilib2019

steps:
- task: Gradle@2
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
tasks: 'build publish -x :snobot_sim_gui:test'
options: '-PciBuild --info'
# checkStyleRunAnalysis: true
# pmdRunAnalysis: true

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: maven repo'
inputs:
PathtoPublish: 'build/maven_repo'
ArtifactName: 'LinuxMaven'

- job: Windows_64_Bit
pool:
vmImage: 'vs2017-win2016'
steps:
- powershell: |
mkdir build
$ProgressPreference = 'SilentlyContinue'
wget "https://download.java.net/java/ga/jdk11/openjdk-11_windows-x64_bin.zip" -O "build\jdk.zip"
displayName: 'Download JDK'
- task: JavaToolInstaller@0
inputs:
jdkSourceOption: localDirectory
jdkFile: 'build/jdk.zip'
jdkDestinationDirectory: 'build/jdkinst'
jdkArchitectureOption: x64
- task: Gradle@2
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
tasks: 'build publish'
options: '-PciBuild -Dhttp.socketTimeout=60000 -Dhttp.connectionTimeout=60000'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: maven repo'
inputs:
PathtoPublish: 'build/maven_repo'
ArtifactName: 'Win64Maven'


- job: Windows_32_Bit
pool:
vmImage: 'vs2017-win2016'
steps:
- powershell: |
mkdir build
$ProgressPreference = 'SilentlyContinue'
wget "https://github.com/wpilibsuite/frc-openjdk-windows/releases/download/v11.0.0u28-1/jdk-x86-11.0.0u28-1.zip" -O "build\jdk.zip"
displayName: 'Download JDK'
- task: JavaToolInstaller@0
inputs:
jdkSourceOption: localDirectory
jdkFile: 'build/jdk.zip'
jdkDestinationDirectory: 'build/jdkinst'
jdkArchitectureOption: x86
- task: Gradle@2
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx1024m'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
tasks: 'build publish'
options: '-PciBuild -Dhttp.socketTimeout=60000 -Dhttp.connectionTimeout=60000 --info'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: maven repo'
inputs:
PathtoPublish: 'build/maven_repo'
ArtifactName: 'Win32Maven'

- job: Mac
pool:
vmImage: 'macOS-10.14'
steps:
- script: |
mkdir build
wget "https://download.java.net/java/ga/jdk11/openjdk-11_osx-x64_bin.tar.gz" -O "build/jdk.tar.gz"
sudo tar xvzf build/jdk.tar.gz -C /Library/Java/JavaVirtualMachines/
export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home/
displayName: 'Setup JDK'
- task: Gradle@2
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
javaHomeOption: 'path'
jdkDirectory: '/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home/'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
tasks: 'build publish'
options: '-PciBuild -Dhttp.socketTimeout=60000 -Dhttp.connectionTimeout=60000 --info'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: maven repo'
inputs:
PathtoPublish: 'build/maven_repo'
ArtifactName: 'OSXMaven'

- job: PrepareMaven
pool:
vmImage: 'ubuntu-16.04'
steps:

- task: DownloadBuildArtifacts@0
displayName: 'Download Linux Artifacts'
inputs:
artifactName: 'LinuxMaven'
downloadPath: $(System.DefaultWorkingDirectory)/linux

- task: DownloadBuildArtifacts@0
displayName: 'Download Windows 32 Artifacts'
inputs:
artifactName: 'Win32Maven'
downloadPath: $(System.DefaultWorkingDirectory)/win32

- task: DownloadBuildArtifacts@0
displayName: 'Download Windows 64 Artifacts'
inputs:
artifactName: 'Win64Maven'
downloadPath: $(System.DefaultWorkingDirectory)/win64

- task: DownloadBuildArtifacts@0
displayName: 'Download Build Artifacts'
inputs:
artifactName: 'OSXMaven'
downloadPath: $(System.DefaultWorkingDirectory)/mac

- powershell: |
Copy-Item $(System.DefaultWorkingDirectory)/win32/Win32Maven/com $(System.DefaultWorkingDirectory)/output/com -recurse -force -verbose
Copy-Item $(System.DefaultWorkingDirectory)/win64/Win64Maven/* $(System.DefaultWorkingDirectory)/output -recurse -force -verbose
Copy-Item $(System.DefaultWorkingDirectory)/mac/OSXMaven/* $(System.DefaultWorkingDirectory)/output -recurse -force -verbose
Copy-Item $(System.DefaultWorkingDirectory)/linux/LinuxMaven/* $(System.DefaultWorkingDirectory)/output -recurse -force -verbose

#- task: PythonScript@0
# displayName: 'Create Combined Native Jar'
# inputs:
# scriptPath: ci_tools/create_all.py
# arguments: "--start_dir=$(System.DefaultWorkingDirectory)/output"

- task: PublishBuildArtifacts@1
displayName: 'Publish Combined Artifacts'
inputs:
PathtoPublish: $(System.DefaultWorkingDirectory)/output
ArtifactName: 'SnobotSimFullMaven'

dependsOn: [ Windows_64_Bit, Windows_32_Bit, Mac, Linux ]
condition: succeeded()
- job: Linux
pool:
vmImage: 'Ubuntu 16.04'

container: wpilib2020

steps:
- task: Gradle@2
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
tasks: 'build publish'
options: '-PciBuild'
# checkStyleRunAnalysis: true
# pmdRunAnalysis: true

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: maven repo'
inputs:
PathtoPublish: 'build/maven_repo'
ArtifactName: 'LinuxMaven'

- job: Windows_64_Bit
pool:
vmImage: 'windows-2019'
steps:
- task: Gradle@2
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
jdkVersionOption: '1.11'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
tasks: 'build publish'
options: '-PciBuild -Dhttp.socketTimeout=60000 -Dhttp.connectionTimeout=60000'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: maven repo'
inputs:
PathtoPublish: 'build/maven_repo'
ArtifactName: 'Win64Maven'


- job: Windows_32_Bit
pool:
vmImage: 'vs2017-win2016'
steps:
- powershell: |
mkdir build
$ProgressPreference = 'SilentlyContinue'
wget "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.4_11.zip" -O "build\jdk.zip"
displayName: 'Download JDK'
- task: JavaToolInstaller@0
inputs:
versionSpec: '11'
jdkSourceOption: localDirectory
jdkFile: 'build/jdk.zip'
jdkDestinationDirectory: 'build/jdkinst'
jdkArchitectureOption: x86
- task: Gradle@2
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx1024m'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
tasks: 'build publish'
options: '-PciBuild -Dhttp.socketTimeout=60000 -Dhttp.connectionTimeout=60000'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: maven repo'
inputs:
PathtoPublish: 'build/maven_repo'
ArtifactName: 'Win32Maven'

- job: Mac
pool:
vmImage: 'macOS-10.14'
steps:
- script: |
mkdir build
export JAVA_HOME=`/usr/libexec/java_home -v 11`
displayName: 'Setup JDK'
- task: Gradle@2
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
jdkVersionOption: '1.11'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
tasks: 'build publish'
options: '-PciBuild -Dhttp.socketTimeout=60000 -Dhttp.connectionTimeout=60000'

- task: PublishBuildArtifacts@1
displayName: 'Publish Artifact: maven repo'
inputs:
PathtoPublish: 'build/maven_repo'
ArtifactName: 'OSXMaven'

- job: PrepareMaven
pool:
vmImage: 'ubuntu-16.04'
steps:

- task: DownloadBuildArtifacts@0
displayName: 'Download Linux Artifacts'
inputs:
artifactName: 'LinuxMaven'
downloadPath: $(System.DefaultWorkingDirectory)/linux

- task: DownloadBuildArtifacts@0
displayName: 'Download Windows 32 Artifacts'
inputs:
artifactName: 'Win32Maven'
downloadPath: $(System.DefaultWorkingDirectory)/win32

- task: DownloadBuildArtifacts@0
displayName: 'Download Windows 64 Artifacts'
inputs:
artifactName: 'Win64Maven'
downloadPath: $(System.DefaultWorkingDirectory)/win64

- task: DownloadBuildArtifacts@0
displayName: 'Download Build Artifacts'
inputs:
artifactName: 'OSXMaven'
downloadPath: $(System.DefaultWorkingDirectory)/mac

- powershell: |
Copy-Item $(System.DefaultWorkingDirectory)/win32/Win32Maven/com $(System.DefaultWorkingDirectory)/output/com -recurse -force -verbose
Copy-Item $(System.DefaultWorkingDirectory)/win64/Win64Maven/* $(System.DefaultWorkingDirectory)/output -recurse -force -verbose
Copy-Item $(System.DefaultWorkingDirectory)/mac/OSXMaven/* $(System.DefaultWorkingDirectory)/output -recurse -force -verbose
Copy-Item $(System.DefaultWorkingDirectory)/linux/LinuxMaven/* $(System.DefaultWorkingDirectory)/output -recurse -force -verbose

#- task: PythonScript@0
# displayName: 'Create Combined Native Jar'
# inputs:
# scriptPath: ci_tools/create_all.py
# arguments: "--start_dir=$(System.DefaultWorkingDirectory)/output"

- task: PublishBuildArtifacts@1
displayName: 'Publish Combined Artifacts'
inputs:
PathtoPublish: $(System.DefaultWorkingDirectory)/output
ArtifactName: 'SnobotSimFullMaven'

dependsOn: [ Windows_64_Bit, Windows_32_Bit, Mac, Linux ]
condition: succeeded()

#- stage: Release
# jobs:
# - job: Test
# pool:
# vmImage: 'Ubuntu 16.04'
#

# steps:
# - task: DownloadBuildArtifacts@0
# displayName: 'Download Build Artifacts'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ ext.getCtreVersion = {
return '5.17.2'
}
ext.getCtreSimVersion = {
return getCtreVersion() + "_V0_RC"
return getCtreVersion() + "_V1"
}
ext.getRevRoboticsVersion = {
return '1.5.0'
}
ext.getRevRoboticsSimVersion = {
return getRevRoboticsVersion() + "_V1"
return getRevRoboticsVersion() + "_V2"
}
ext.getNavxVersion = {
return '3.1.403'
Expand Down
2 changes: 0 additions & 2 deletions snobot_sim/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ dependencies {
testRuntime 'edu.wpi.first.cscore:cscore-jni:' + getCsCoreVersion() + ':' + getCurrentOsArch()
testRuntime 'edu.wpi.first.thirdparty.frc2020.opencv:opencv-java:' + getWpilibOpencvVersion()
testRuntime 'edu.wpi.first.thirdparty.frc2020.opencv:opencv-jni:' + getWpilibOpencvVersion() + ':' + getCurrentOsArch()
testRuntime 'com.snobot.simulator:ctre_sim_override:' + getCtreSimVersion() + ':' + getCurrentOsArch()
testRuntime 'com.snobot.simulator:rev_simulator:' + getRevRoboticsSimVersion() + ':' + getCurrentOsArch()
}

nativeUtils {
Expand Down
Loading