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

Enable publishing of versioned jaeger-v2 artifacts #5984

Merged
merged 14 commits into from
Sep 14, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fix
Signed-off-by: Yuri Shkuro <github@ysh.us>
yurishkuro committed Sep 14, 2024
commit 861d8c2059c5435329664d3fd50bd56205c45b2c
3 changes: 1 addition & 2 deletions .github/workflows/ci-docker-all-in-one.yml
Original file line number Diff line number Diff line change
@@ -57,8 +57,7 @@ jobs:
;;
esac

- name: Determine healthcheck setting
id: healthcheck
- name: Customize the build based on v1/v2 version
run: |
if [[ "${{ matrix.jaeger_version }}" == "v1" ]]; then
echo "HEALTHCHECK_V2=false" >> $GITHUB_ENV
6 changes: 3 additions & 3 deletions scripts/build-all-in-one-image.sh
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ platforms="$(make echo-linux-platforms)"
FLAGS=()
BINARY='all-in-one'

while getopts "b:Dhlp:" opt; do
while getopts "b:Dhlop:" opt; do
case "${opt}" in
b)
BINARY=${OPTARG}
@@ -31,10 +31,10 @@ while getopts "b:Dhlp:" opt; do
;;
l)
# in the local-only mode the images will only be pushed to local registry
FLAGS=("${FLAGS[@]}" -l)
FLAGS=("${FLAGS[@]}" -l)
;;
o)
FLAGS=("${FLAGS[@]}" -o)
FLAGS=("${FLAGS[@]}" -o)
;;
p)
platforms=${OPTARG}
2 changes: 1 addition & 1 deletion scripts/build-hotrod-image.sh
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ current_platform="$(go env GOOS)/$(go env GOARCH)"
FLAGS=()
success="false"

while getopts "hlp:" opt; do
while getopts "hlop:" opt; do
case "${opt}" in
l)
# in the local-only mode the images will only be pushed to local registry