From 2364168a2ee5311c680a03ad233678c6b2daa0d6 Mon Sep 17 00:00:00 2001 From: David Wood Date: Fri, 3 May 2024 09:36:21 -0400 Subject: [PATCH 1/3] added comment in doc_id Makefile on version definition Signed-off-by: David Wood --- transforms/universal/doc_id/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/transforms/universal/doc_id/Makefile b/transforms/universal/doc_id/Makefile index 247b45c3c..18afecbe3 100644 --- a/transforms/universal/doc_id/Makefile +++ b/transforms/universal/doc_id/Makefile @@ -7,6 +7,7 @@ REPOROOT=../../.. include ../../.make.transforms TRANSFORM_NAME=doc_id +# $(REPOROOT)/.make.versions file contains the versions DOCKER_IMAGE_VERSION=${DOC_ID_VERSION} venv:: .transforms.venv From d3166986dddbade74d324623e0642dfc2c61b4b7 Mon Sep 17 00:00:00 2001 From: David Wood Date: Fri, 3 May 2024 12:48:21 -0400 Subject: [PATCH 2/3] Allow mino-start to be extended by transforms. --- transforms/.make.transforms | 4 ++-- transforms/code/code_quality/Makefile | 2 ++ transforms/code/malware/Makefile | 2 ++ transforms/code/proglang_select/Makefile | 2 ++ transforms/universal/doc_id/Makefile | 2 ++ transforms/universal/ededup/Makefile | 2 ++ transforms/universal/fdedup/Makefile | 2 ++ transforms/universal/filter/Makefile | 2 ++ transforms/universal/noop/Makefile | 2 ++ transforms/universal/tokenization/Makefile | 2 ++ 10 files changed, 20 insertions(+), 2 deletions(-) diff --git a/transforms/.make.transforms b/transforms/.make.transforms index fe8fcbcce..f72bb1221 100644 --- a/transforms/.make.transforms +++ b/transforms/.make.transforms @@ -245,8 +245,8 @@ conventions: $(MAKE) MINIO_SRC=$$dir/test-data/input MINIO_DEST=$(TRANSFORM_NAME)/ .defaults.minio.load-test-data -.PHONY: minio-start -minio-start: +.PHONY: .minio-start +.minio-start: $(MAKE) .defaults.minio.start $(MAKE) .transforms.minio-load @# Help: Start and load the minio server with $(TRANSFORM_NAME) test data diff --git a/transforms/code/code_quality/Makefile b/transforms/code/code_quality/Makefile index b37c2c709..26c73f4dc 100644 --- a/transforms/code/code_quality/Makefile +++ b/transforms/code/code_quality/Makefile @@ -42,3 +42,5 @@ run-local-ray-sample: .transforms.run-local-ray-sample run-s3-ray-sample: .transforms.run-s3-ray-sample +minio-start: .minio-start + diff --git a/transforms/code/malware/Makefile b/transforms/code/malware/Makefile index 7f6860f44..d93fdbb37 100644 --- a/transforms/code/malware/Makefile +++ b/transforms/code/malware/Makefile @@ -51,3 +51,5 @@ run-s3-ray-sample: #.transforms.run-s3-ray-sample @# Help: Not implemented yet @echo "No src/malware_s3_ray.py yet :(" +minio-start: .minio-start + diff --git a/transforms/code/proglang_select/Makefile b/transforms/code/proglang_select/Makefile index ed2e38b8c..1661e3536 100644 --- a/transforms/code/proglang_select/Makefile +++ b/transforms/code/proglang_select/Makefile @@ -43,3 +43,5 @@ run-local-ray-sample: .transforms.run-local-ray-sample run-s3-ray-sample: .transforms.run-s3-ray-sample +minio-start: .minio-start + diff --git a/transforms/universal/doc_id/Makefile b/transforms/universal/doc_id/Makefile index 18afecbe3..fdad3d19b 100644 --- a/transforms/universal/doc_id/Makefile +++ b/transforms/universal/doc_id/Makefile @@ -40,3 +40,5 @@ run-local-ray-sample: .transforms.run-local-ray-sample run-s3-ray-sample: .transforms.run-s3-ray-sample +minio-start: .minio-start + diff --git a/transforms/universal/ededup/Makefile b/transforms/universal/ededup/Makefile index 02e7653c8..2256ae151 100644 --- a/transforms/universal/ededup/Makefile +++ b/transforms/universal/ededup/Makefile @@ -46,3 +46,5 @@ run-local-ray-sample: .transforms.run-local-ray-sample run-s3-ray-sample: .transforms.run-s3-ray-sample +minio-start: .minio-start + diff --git a/transforms/universal/fdedup/Makefile b/transforms/universal/fdedup/Makefile index 5d93d20ed..d68a2faa5 100644 --- a/transforms/universal/fdedup/Makefile +++ b/transforms/universal/fdedup/Makefile @@ -43,3 +43,5 @@ run-local-ray-sample: .transforms.run-local-ray-sample run-s3-ray-sample: .transforms.run-s3-ray-sample +minio-start: .minio-start + diff --git a/transforms/universal/filter/Makefile b/transforms/universal/filter/Makefile index 05b88d587..6fd323810 100644 --- a/transforms/universal/filter/Makefile +++ b/transforms/universal/filter/Makefile @@ -44,3 +44,5 @@ run-local-ray-sample: .transforms.run-local-ray-sample run-s3-ray-sample: .transforms.run-s3-ray-sample +minio-start: .minio-start + diff --git a/transforms/universal/noop/Makefile b/transforms/universal/noop/Makefile index eb8af7d3c..a7bcfb384 100644 --- a/transforms/universal/noop/Makefile +++ b/transforms/universal/noop/Makefile @@ -36,3 +36,5 @@ run-local-ray-sample: .transforms.run-local-ray-sample run-s3-ray-sample: .transforms.run-s3-ray-sample +minio-start: .minio-start + diff --git a/transforms/universal/tokenization/Makefile b/transforms/universal/tokenization/Makefile index 1a8610581..a6f102bb0 100644 --- a/transforms/universal/tokenization/Makefile +++ b/transforms/universal/tokenization/Makefile @@ -43,3 +43,5 @@ run-local-ray-sample: .transforms.run-local-ray-sample run-s3-ray-sample: .transforms.run-s3-ray-sample +minio-start: .minio-start + From 3afadbcfb9f0719b52d8d0c79d18773a35733a49 Mon Sep 17 00:00:00 2001 From: David Wood Date: Fri, 3 May 2024 12:58:47 -0400 Subject: [PATCH 3/3] Use command to check for availability of executables Signed-off-by: David Wood --- .make.defaults | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.make.defaults b/.make.defaults index 516c820cc..36ec7bbf9 100644 --- a/.make.defaults +++ b/.make.defaults @@ -236,10 +236,9 @@ __check_defined = \ .PHONY: .defaults.check.installed .defaults.check.installed:: - @installed=$$(which $(CHECK_RUNNABLE)); \ - if [ -z "$$installed" ]; then \ - echo $(CHECK_RUNNABLE) must be installed; \ - exit 1; \ + if [ ! command -v $(CHECK_RUNNABLE) &>/dev/null ]; then \ + echo $(CHECK_RUNNABLE) must be installed; \ + exit 1; \ fi .PHONY: .defaults.minio.check