CI improvements #108
CI improvements #108
Conversation
pkwarren
force-pushed
the
pkw/update-gradle
branch
from
71aa716
to
41d6610
Compare
pkwarren
force-pushed
the
pkw/update-gradle
branch
from
02f4f9d
to
81b542e
Compare
Update gradle to the latest version, build in CI with the latest LTS Java version, and remove unused Maven repository for generated SDKs (code generation has moved to happen in this project directly). Update to use buf maven artifact instead of an expensive (uncached) build each CI run.
pkwarren
force-pushed
the
pkw/update-gradle
branch
from
81b542e
to
97cd5ce
Compare
| ~/go/pkg/mod | ||
| key: ${{ runner.os }}-gomod-ci-${{ hashFiles('gradle.properties', 'gradle/libs.versions.toml') }} | ||
| restore-keys: | ||
| ${{ runner.os }}-gomod-ci- |
There was a problem hiding this comment.
For the ci/release workflows, we now cache go modules and build for building the license header binary. We no longer need to build the buf binary as we pull it from the Maven artifact.
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: '17' | ||
| java-version: '21' |
There was a problem hiding this comment.
Bumping to latest LTS - we still build with source/target/release set to Java 8 compatibility.
| ~/go/pkg/mod | ||
| key: ${{ runner.os }}-gomod-conformance-${{ hashFiles('gradle.properties', 'gradle/libs.versions.toml') }} | ||
| restore-keys: | ||
| ${{ runner.os }}-gomod-conformance- |
There was a problem hiding this comment.
Conformance workflow uses a different cache as it also downloads and builds the conformance binary from bufbuild/protovalidate.
| environment("GOBIN", bufCLIFile.parentFile.absolutePath) | ||
| outputs.file(bufCLIFile) | ||
| commandLine("go", "install", "github.com/bufbuild/buf/cmd/buf@latest") | ||
| File(buf.asPath).setExecutable(true) |
There was a problem hiding this comment.
Instead of needing to download all the buf dependencies and build the CLI, we just download the Maven artifact and make it executable. This also has the benefit of including the artifact in the existing gradle CI cache.
| } | ||
|
|
||
| tasks.register<Exec>("installLicenseHeader") { | ||
| description = "Installs the Buf license-header CLI." | ||
| environment("GOBIN", bufLicenseHeaderCLIFile.parentFile.absolutePath) | ||
| outputs.file(bufLicenseHeaderCLIFile) | ||
| commandLine("go", "install", "github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@latest") | ||
| commandLine("go", "install", "github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v${libs.versions.buf.get()}") |
There was a problem hiding this comment.
This should keep our builds stable as we no longer depend on latest.
| maven { | ||
| name = "buf" | ||
| url = uri("https://buf.build/gen/maven") | ||
| } |
There was a problem hiding this comment.
Originally this project used a generated SDK, but it now builds the conformance protos as part of this project so we can remove this.
There was a problem hiding this comment.
👍. I really wanted to use a generated SDK for the newer conformance protos, but then we don't have the option to build for both lite and standard Java runtimes. Do we? If there's a way to pick which runtime to use in the URL, I'm all ears and will happily move this back to using generated SDKs (since that's what we use in conformance tests for other languages that generated SDKs support).
There was a problem hiding this comment.
Yep - you can use a lite runtime artifact for plugins that support it: https://buf.build/docs/bsr/generated-sdks/maven#remote
| testImplementation(libs.assertj) | ||
| testImplementation(platform(libs.junit.bom)) | ||
| testImplementation("org.junit.jupiter:junit-jupiter") | ||
| testRuntimeOnly("org.junit.platform:junit-platform-launcher") |
| @@ -10,6 +11,7 @@ protobuf = "3.25.3" | |||
|
|
|||
| [libraries] | |||
| assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } | |||
| buf = { module = "buf.build:buf", version.ref = "buf" } | |||
There was a problem hiding this comment.
🤞 that this will keep the Buf CLI updated with dependabot.
Update gradle to the latest version, build in CI with the latest LTS Java version, and remove unused Maven repository for generated SDKs (code generation has moved to happen in this project directly).