Skip to content

Commit

Permalink
ci: Pass variable instead of calling make build-xxx-debug (#4883)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
- Follow up to $4882
- Crossdock and all-in-one workflows failed on `main` branch

## Description of the changes
- `build-all-in-one-debug` target was removed, call `make
build-all-in-one DEBUG_BINARY=1`
- fix invalid variable quoting in `scripts/build-crossdock.sh`

## How was this change tested?
- Will check CI once this is merged

---------

Signed-off-by: Yuri Shkuro <github@ysh.us>
  • Loading branch information
yurishkuro committed Oct 23, 2023
1 parent 92ba189 commit d7450ef
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions scripts/build-all-in-one-image.sh
Expand Up @@ -58,10 +58,10 @@ bash scripts/build-upload-a-docker-image.sh -b -c all-in-one -d cmd/all-in-one -

# build debug image if not on a pull request
if [ "$mode" != "pr-only" ]; then
make build-all-in-one-debug GOOS=linux GOARCH="$GOARCH"
make build-all-in-one GOOS=linux GOARCH="$GOARCH" DEBUG_BINARY=1
repo=${repo}-debug

# build all-in-one-debug image locally for integration test
# build all-in-one DEBUG image locally for integration test
bash scripts/build-upload-a-docker-image.sh -l -b -c all-in-one-debug -d cmd/all-in-one -t debug
run_integration_test localhost:5000/$repo

Expand Down
2 changes: 1 addition & 1 deletion scripts/build-crossdock.sh
Expand Up @@ -11,7 +11,7 @@ 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/compute-tags.sh '$REPO')"
IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/compute-tags.sh ${REPO})"
IMAGE_TAGS+=("--tag" "docker.io/${REPO}:${COMMIT}" "--tag" "quay.io/${REPO}:${COMMIT}")
bash scripts/docker-login.sh
docker buildx build --push \
Expand Down

0 comments on commit d7450ef

Please sign in to comment.