build changes

micronaut-projects · Jan 8, 2025 · 26160ae · 26160ae
1 parent 2efd854
commit 26160ae
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/build-logic/src/main/groovy/io.micronaut.build.internal.fuzzing-module.gradle b/build-logic/src/main/groovy/io.micronaut.build.internal.fuzzing-module.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'io.micronaut.build.internal.fuzzing-base'
-    id "io.micronaut.build.internal.module"
+    id "io.micronaut.build.internal.base-module"
 }
 
 micronautBuild {

diff --git a/oss-fuzz/build.sh b/oss-fuzz/build.sh
@@ -5,6 +5,8 @@ set -e
 mkdir -p ~/.gradle
 echo "auto.include.git.dirs=$(pwd)" >> ~/.gradle/gradle.properties
 
+export OSSFUZZ_MICRONAUT_BRANCH=$(cd micronaut-core && git rev-parse --abbrev-ref HEAD)
+
 cd micronaut-fuzzing
 
 # bug in micronaut-build

diff --git a/oss-fuzz/checkout.sh b/oss-fuzz/checkout.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-git clone -b 4.8.x --depth=1 https://github.com/micronaut-projects/micronaut-core.git
+git clone --depth=1 https://github.com/micronaut-projects/micronaut-core.git
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -26,5 +26,8 @@ micronautBuild {
     useStandardizedProjectNames = true
 
     importMicronautCatalog()
-    requiresDevelopmentVersion("micronaut-core", "4.8.x")
+
+    if (providers.environmentVariable("OSSFUZZ_MICRONAUT_BRANCH").isPresent) {
+        requiresDevelopmentVersion("micronaut-core", providers.environmentVariable("OSSFUZZ_MICRONAUT_BRANCH").get())
+    }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		set -e

		git clone -b 4.8.x --depth=1 https://github.com/micronaut-projects/micronaut-core.git
		git clone --depth=1 https://github.com/micronaut-projects/micronaut-core.git