Move remaining util scripts (#6472)

jaegertracing · Jan 4, 2025 · bd7e3da · bd7e3da
1 parent 59b544a
commit bd7e3da
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci-build-binaries.yml b/.github/workflows/ci-build-binaries.yml
@@ -25,7 +25,7 @@ jobs:
     - name: define matrix
       id: set-matrix
       run: |
-        echo "matrix=$(bash scripts/platforms-to-gh-matrix.sh)" >> $GITHUB_OUTPUT
+        echo "matrix=$(bash scripts/utils/platforms-to-gh-matrix.sh)" >> $GITHUB_OUTPUT
 
   build-binaries:
     needs: generate-matrix

diff --git a/Makefile.BuildInfo.mk b/Makefile.BuildInfo.mk
@@ -5,8 +5,8 @@ GIT_SHA=$(shell git rev-parse HEAD)
 DATE=$(shell TZ=UTC0 git show --quiet --date='format-local:%Y-%m-%dT%H:%M:%SZ' --format="%cd")
 # Defer evaluation of semver tags until actually needed, using trick from StackOverflow:
 # https://stackoverflow.com/questions/44114466/how-to-declare-a-deferred-variable-that-is-computed-only-once-for-all
-GIT_CLOSEST_TAG_V1 = $(eval GIT_CLOSEST_TAG_V1 := $(shell scripts/compute-version.sh v1))$(GIT_CLOSEST_TAG_V1)
-GIT_CLOSEST_TAG_V2 = $(eval GIT_CLOSEST_TAG_V2 := $(shell scripts/compute-version.sh v2))$(GIT_CLOSEST_TAG_V2)
+GIT_CLOSEST_TAG_V1 = $(eval GIT_CLOSEST_TAG_V1 := $(shell scripts/utils/compute-version.sh v1))$(GIT_CLOSEST_TAG_V1)
+GIT_CLOSEST_TAG_V2 = $(eval GIT_CLOSEST_TAG_V2 := $(shell scripts/utils/compute-version.sh v2))$(GIT_CLOSEST_TAG_V2)
 
 # args: (1) - name, (2) - value
 define buildinfo

diff --git a/Makefile.Windows.mk b/Makefile.Windows.mk
@@ -60,7 +60,7 @@ endef
 
 .PHONY: _build-syso
 _build-syso: $(GOVERSIONINFO)
-	$(eval SEMVER_ALL := $(shell scripts/compute-version.sh -s v1))
+	$(eval SEMVER_ALL := $(shell scripts/utils/compute-version.sh -s v1))
 	$(eval SEMVER_MAJOR := $(word 2, $(SEMVER_ALL)))
 	$(eval SEMVER_MINOR := $(word 3, $(SEMVER_ALL)))
 	$(eval SEMVER_PATCH := $(word 4, $(SEMVER_ALL)))

diff --git a/scripts/build/build-upload-a-docker-image.sh b/scripts/build/build-upload-a-docker-image.sh
@@ -131,7 +131,7 @@ echo "Finished building${upload_comment} ${component_name} =============="
 
 if [[ "$upload_readme" == "Y" ]]; then
   echo "::group:: docker upload ${dir_arg}/README.md"
-  bash scripts/upload-docker-readme.sh "${component_name}" "${dir_arg}"/README.md
+  bash scripts/build/upload-docker-readme.sh "${component_name}" "${dir_arg}"/README.md
   echo "::endgroup::"
 fi
 

diff --git a/scripts/upload-docker-readme.sh → scripts/build/upload-docker-readme.sh b/scripts/upload-docker-readme.sh → scripts/build/upload-docker-readme.sh
diff --git a/scripts/compute-version.sh → scripts/utils/compute-version.sh b/scripts/compute-version.sh → scripts/utils/compute-version.sh
diff --git a/scripts/generate-help-output.sh → scripts/utils/generate-help-output.sh b/scripts/generate-help-output.sh → scripts/utils/generate-help-output.sh
diff --git a/scripts/platforms-to-gh-matrix.sh → scripts/utils/platforms-to-gh-matrix.sh b/scripts/platforms-to-gh-matrix.sh → scripts/utils/platforms-to-gh-matrix.sh