Skip to content

Commit

Permalink
Fix muzzle CI step (#7746)
Browse files Browse the repository at this point in the history
* fix: Fix OOM writeMuzzleTasksToFile gradle task
* fix: Set minimun supported version for protobuf instrumentation
* feat: Restore muzzle as PR check requirement
  • Loading branch information
PerfectSlayer authored Oct 9, 2024
1 parent 2a9a4b7 commit 14a45ea
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .circleci/config.continue.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,7 @@ jobs:
name: Gather muzzle tasks
command: >-
SKIP_BUILDSCAN="true"
GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
./gradlew writeMuzzleTasksToFile
<< pipeline.parameters.gradle_flags >>
--max-workers=3
Expand Down Expand Up @@ -1434,6 +1435,7 @@ build_test_jobs: &build_test_jobs
{% for jdk in all_jdks %}
- "test_{{ jdk }}"
{% endfor %}
- muzzle
- profiling
- debugger
- system-tests
Expand Down
3 changes: 2 additions & 1 deletion dd-java-agent/instrumentation/protobuf/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ muzzle {
pass {
group = "com.google.protobuf"
module = "protobuf-java"
versions = "[,)"
versions = "[2.0.0,)"
skipVersions = ["2.0.1", "2.1.0", "2.2.0", "2.3.0", "2.4.1"]
assertInverse = true
}
}
Expand Down

0 comments on commit 14a45ea

Please sign in to comment.