Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move remaining util scripts #6472

Merged
merged 3 commits into from
Jan 4, 2025
+5 −5
Merged

Move remaining util scripts #6472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
767d792
moved scripts
danish9039 Jan 3, 2025
baf9df7
Merge branch 'main' into scripts
yurishkuro Jan 3, 2025
218bbe1
Merge branch 'main' into scripts
danish9039 Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-build-binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile.BuildInfo.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile.Windows.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/build-upload-a-docker-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 scripts/upload-docker-readme.sh → scripts/build/upload-docker-readme.sh
View file
Open in desktop
File renamed without changes.
0 scripts/compute-version.sh → scripts/utils/compute-version.sh
View file
Open in desktop
File renamed without changes.
0 scripts/generate-help-output.sh → scripts/utils/generate-help-output.sh
View file
Open in desktop
File renamed without changes.
0 scripts/platforms-to-gh-matrix.sh → scripts/utils/platforms-to-gh-matrix.sh
View file
Open in desktop
File renamed without changes.
Loading