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.

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 script/util/* to script/utils/* #6465

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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-lint-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@ jobs:

- name: Run unit tests for scripts
run: |
SHUNIT2=.tools/shunit2 bash scripts/util/compute-tags.test.sh
SHUNIT2=.tools/shunit2 bash scripts/utils/compute-tags.test.sh
4 changes: 2 additions & 2 deletions scripts/build/build-crossdock.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ make build-and-run-crossdock
if [[ "$BRANCH" == "main" ]]; then
echo 'upload images to dockerhub/quay.io'
REPO=jaegertracing/test-driver
IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/util/compute-tags.sh ${REPO})"
IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/utils/compute-tags.sh ${REPO})"
IMAGE_TAGS+=("--tag" "docker.io/${REPO}:${COMMIT}" "--tag" "quay.io/${REPO}:${COMMIT}")
bash scripts/util/docker-login.sh
bash scripts/utils/docker-login.sh

docker buildx build --push \
--progress=plain \
Expand Down
4 changes: 2 additions & 2 deletions scripts/build/build-upload-a-docker-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ if [[ "${local_test_only}" = "Y" ]]; then
else
echo "::group:: compute tags ${component_name}"
# shellcheck disable=SC2086
IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/util/compute-tags.sh ${namespace}/${component_name})"
IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/utils/compute-tags.sh ${namespace}/${component_name})"
echo "::endgroup::"

# Only push multi-arch images to dockerhub/quay.io for main branch or for release tags vM.N.P{-rcX}
if [[ "$BRANCH" == "main" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?$ ]]; then
echo "will build docker images and upload to dockerhub/quay.io, BRANCH=$BRANCH"
bash scripts/util/docker-login.sh
bash scripts/utils/docker-login.sh
PUSHTAG="type=image,push=true"
upload_comment=" and uploading"
if [[ "$overwrite" == 'N' ]]; then
Expand Down
File renamed without changes.
File renamed without changes.
Loading