Skip to content

Commit

Permalink
Use JDK 17 for CI (#552)
Browse files Browse the repository at this point in the history
Update readme for JDK 17, and update C++ compiler instructions
  • Loading branch information
sciencewhiz authored Sep 2, 2023
1 parent a269184 commit 0fb92f7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ The WPILib Mission is to enable FIRST teams to focus on writing game-specific so
Building RobotBuilder is very straightforward. WPILib uses Gradle to compile.

## Requirements
- [JDK 11](https://adoptium.net/releases.html?variant=openjdk11&jvmVariant=hotspot)
- [JDK 17](https://adoptium.net/temurin/releases/?variant=openjdk11&jvmVariant=hotspot&version=17)
- A c++ Compiler (for c++ compile test). Any one of:
- On Linux, install GCC 7+
- On Windows, install [Visual Studio Community 2019](https://visualstudio.microsoft.com/vs/community/) and select the C++ programming language during installation
- On Windows, install [Visual Studio Community 2022](https://visualstudio.microsoft.com/vs/community/) and select the C++ programming language during installation
- On macOS, install the Xcode command-line build tools via `xcode-select --install`
- [ARM compiler toolchain](https://github.com/wpilibsuite/roborio-toolchain/releases)
- ARM compiler toolchain
- Run `./gradlew installRoboRioToolchain` after cloning this repository
- If the WPILib installer was used, this toolchain is already installed

## Running

Expand Down
12 changes: 6 additions & 6 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ stages:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
jdkVersionOption: '1.11'
jdkVersionOption: '1.17'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
testRunTitle: Win64
Expand All @@ -64,14 +64,14 @@ stages:
steps:
- script: |
mkdir build
export JAVA_HOME=`/usr/libexec/java_home -v 11`
export JAVA_HOME=`/usr/libexec/java_home -v 17`
displayName: 'Setup JDK'
- task: Gradle@2
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
jdkVersionOption: '1.11'
jdkVersionOption: '1.17'
publishJUnitResults: true
testResultsFiles: '**/TEST-*.xml'
testRunTitle: MacOS
Expand All @@ -91,7 +91,7 @@ stages:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
jdkVersionOption: '1.11'
jdkVersionOption: '1.17'
tasks: 'publish'
options: '-PbuildServer'
condition: and(succeeded(), and(ne(variables['Build.SourceBranch'], 'refs/heads/main'), not(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))))
Expand All @@ -102,7 +102,7 @@ stages:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
gradleOptions: '-Xmx3072m'
jdkVersionOption: '1.11'
jdkVersionOption: '1.17'
tasks: 'publish'
options: '-PbuildServer'
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
Expand All @@ -116,7 +116,7 @@ stages:
inputs:
workingDirectory: ''
gradleWrapperFile: 'gradlew'
jdkVersionOption: '1.11'
jdkVersionOption: '1.17'
gradleOptions: '-Xmx3072m'
tasks: 'publish '
options: '-PreleaseMode -PbuildServer'
Expand Down

0 comments on commit 0fb92f7

Please sign in to comment.