Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jmhCompile should not compile with compiler arg -Werror #866

Merged
merged 10 commits into from
Feb 18, 2020
Merged

jmhCompile should not compile with compiler arg -Werror #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9123754
Merge pull request #1 from open-telemetry/master
DotSpy Feb 2, 2020
47da1ef
style: format jmh.gradle, use not deprecated archiveFileName
DotSpy Feb 5, 2020
dc5cfb7
Merge remote-tracking branch 'upstream/master'
DotSpy Feb 7, 2020
7fa4f47
Merge remote-tracking branch 'upstream/master'
DotSpy Feb 14, 2020
4d36a96
fix: jmhCompile should not compile with compiler arg -Werror
DotSpy Feb 16, 2020
8d0a2ce
build: add ./gradlew jmhCompile to ci
DotSpy Feb 17, 2020
7ffed1c
build: add ./gradlew jmhCompile to ci
DotSpy Feb 17, 2020
32fb9a1
fix: jmhCompile -> compileJmhJava
DotSpy Feb 17, 2020
e2d7df9
ci: separate target for benchmark
DotSpy Feb 17, 2020
b826c8d
fix: becnhmark -> benchmark
DotSpy Feb 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
7 changes: 7 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ init_task: &init_task
build_task: &build_task
name: Build
command: make test
compile_benchmark_task: &compile_benchmark_task
name: Compile JMH
command: make benchmark
verify_task: &verify_task
name: Verify Google Java Format
command: make verify-format
Expand All @@ -32,6 +35,8 @@ jobs:
<<: *verify_task
- run:
<<: *build_task
- run:
<<: *compile_benchmark_task
- run:
name: Cover
command: ./gradlew check :opentelemetry-all:jacocoTestReport
Expand Down Expand Up @@ -65,6 +70,8 @@ jobs:
<<: *verify_task
- run:
<<: *build_task
- run:
<<: *compile_benchmark_task
- save_cache:
paths:
- ~/.gradle
Expand Down
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
test:
./gradlew clean assemble check --stacktrace

.PHONY: benchmark
benchmark:
./gradlew compileJmhJava
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would create a different Makefile target for the benchmarks. This way, we can decouple benchmarks from compilation in CircleCI

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree


.PHONY: init-git-submodules
init-git-submodules:
git submodule init
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ subprojects {
it.options.errorprone.excludedPaths = ".*generated.*" // "-XepExcludedPaths:.*/build/generated/source/proto/.*"

// Enforce errorprone warnings to be errors.
if (!JavaVersion.current().isJava9() && !JavaVersion.current().isJava10() && !JavaVersion.current().isJava11()) {
if (!JavaVersion.current().isJava9() && !JavaVersion.current().isJava10() && !JavaVersion.current().isJava11() && it != compileJmhJava) {
// TODO: Enable -Werror for Java 9+
it.options.compilerArgs += ["-Werror"]
}
Expand Down