diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2e5e18f..42e4cfd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -42,8 +42,8 @@ jobs: - name: Rename run: | mv workspace/ichnaea.zip ichnaea.zip - mv workspace/securibench-micro-JAVA_BYTECODE.zip securibench-micro-JAVA_BYTECODE.zip - mv workspace/securibench-micro-JAVA_SRC.zip securibench-micro-JAVA_SRC.zip + mv workspace/securibench-micro-JAVA.zip securibench-micro-JAVA.zip + mv workspace/securibench-micro-JAVASRC.zip securibench-micro-JAVASRC.zip - name: Set next release version id: taggerFinal uses: anothrNick/github-tag-action@1.61.0 @@ -56,5 +56,5 @@ jobs: tag_name: ${{ steps.taggerDryRun.outputs.new_tag }} files: | ichnaea.zip - securibench-micro-JAVA_BYTECODE.zip - securibench-micro-JAVA_SRC.zip \ No newline at end of file + securibench-micro-JAVA.zip + securibench-micro-JAVASRC.zip \ No newline at end of file diff --git a/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDataset.scala b/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDataset.scala index 0e445c6..7429c06 100644 --- a/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDataset.scala +++ b/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDataset.scala @@ -44,12 +44,9 @@ object BenchmarkDataset { // (AvailableBenchmarks.OWASP_JAVA, x => new OWASPJavaDownloader(x.datasetDir)), ( AvailableBenchmarks.SECURIBENCH_MICRO_JAVASRC, - x => new SecuribenchMicroDownloader(x.datasetDir, JavaCpgTypes.JAVA_SRC) - ), - ( - AvailableBenchmarks.SECURIBENCH_MICRO_JAVA, - x => new SecuribenchMicroDownloader(x.datasetDir, JavaCpgTypes.JAVA_BYTECODE) + x => new SecuribenchMicroDownloader(x.datasetDir, JavaCpgTypes.JAVASRC) ), + (AvailableBenchmarks.SECURIBENCH_MICRO_JAVA, x => new SecuribenchMicroDownloader(x.datasetDir, JavaCpgTypes.JAVA)), (AvailableBenchmarks.ICHNAEA_JSSRC, x => new IchnaeaDownloader(x.datasetDir)) ) diff --git a/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDatasetConfig.scala b/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDatasetConfig.scala index ce247e4..28fc567 100644 --- a/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDatasetConfig.scala +++ b/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDatasetConfig.scala @@ -17,8 +17,8 @@ object AvailableBenchmarks extends Enumeration { } object JavaCpgTypes extends Enumeration { - val JAVA_SRC = Value - val JAVA_BYTECODE = Value + val JAVASRC = Value + val JAVA = Value } object OutputFormat extends Enumeration { diff --git a/src/main/scala/io/joern/benchmarks/datasets/runner/SecuribenchMicroDownloader.scala b/src/main/scala/io/joern/benchmarks/datasets/runner/SecuribenchMicroDownloader.scala index e972d25..b601c6d 100644 --- a/src/main/scala/io/joern/benchmarks/datasets/runner/SecuribenchMicroDownloader.scala +++ b/src/main/scala/io/joern/benchmarks/datasets/runner/SecuribenchMicroDownloader.scala @@ -29,7 +29,7 @@ class SecuribenchMicroDownloader(datasetDir: File, cpgCreatorType: JavaCpgTypes. downloadBenchmarkAndUnarchive(CompressionTypes.ZIP) downloadFile(apacheJdo, benchmarkBaseDir / "lib" / "jdo-api-3.1.jar") if ( - cpgCreatorType == JavaCpgTypes.JAVA_BYTECODE && (benchmarkBaseDir / "classes") + cpgCreatorType == JavaCpgTypes.JAVA && (benchmarkBaseDir / "classes") .walk() .count(_.`extension`.contains(".class")) < 1 ) {