Skip to content

Commit 4f9dc73

Browse files
committed
Add project goharbor/distribution with branch release/2.8
1 parent 8b4f46c commit 4f9dc73

14 files changed

Lines changed: 4139 additions & 2 deletions

Common.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,7 @@ $(GIT_CHECKOUT_TARGET): | $(REPO)
604604
@rm -f $(REPO)/eks-anywhere-*
605605
(cd $(REPO) && $(BASE_DIRECTORY)/build/lib/wait_for_tag.sh $(GIT_TAG))
606606
git -C $(REPO) checkout --quiet -f $(GIT_TAG)
607+
@mkdir -p $(dir $@)
607608
@touch $@
608609
@echo -e $(call TARGET_END_LOG)
609610

UPSTREAM_PROJECTS.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414

1515
# This file was generated by running `make generate`. DO NOT EDIT
16-
1716
projects:
1817
- org: apache
1918
repos:
@@ -113,6 +112,10 @@ projects:
113112
go_version: "1.23"
114113
- org: goharbor
115114
repos:
115+
- name: distribution
116+
versions:
117+
- tag: release/2.8
118+
go_version: "1.23"
116119
- name: harbor
117120
versions:
118121
- tag: v2.12.2

build/lib/common.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,14 @@ function build::common::wait_for_tag() {
423423
git fetch --tags > /dev/null 2>&1
424424
echo "Tag ${tag} does not exist!"
425425
echo "Waiting for tag ${tag}..."
426+
427+
# also check for branch if tag not found
428+
echo "Checking for branch ${tag}..."
429+
git rev-parse --verify --quiet "origin/${tag}" && echo "Branch ${tag} exists!" && break
430+
git fetch --all > /dev/null 2>&1
431+
echo "Branch ${tag} does not exist!"
432+
echo "Waiting for branch ${tag}..."
433+
426434
sleep $sleep_interval
427435
if [ "$i" = "60" ]; then
428436
exit 1

build/lib/simple_create_tarballs.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,14 @@ function build::simple::tarball() {
3838
for platform in "${SUPPORTED_PLATFORMS[@]}"; do
3939
OS="$(cut -d '/' -f1 <<< ${platform})"
4040
ARCH="$(cut -d '/' -f2 <<< ${platform})"
41-
TAR_FILE="${TAR_FILE_PREFIX}-${OS}-${ARCH}-${TAG}.tar.gz"
41+
42+
# Check if TAG contains '/' and create directory if needed
43+
if [[ "$TAG" == *"/"* ]]; then
44+
mkdir -p "${TAR_PATH}/${TAR_FILE_PREFIX}-${OS}-${ARCH}-${TAG%/*}"
45+
TAR_FILE="${TAR_FILE_PREFIX}-${OS}-${ARCH}-${TAG}.tar.gz"
46+
else
47+
TAR_FILE="${TAR_FILE_PREFIX}-${OS}-${ARCH}-${TAG}.tar.gz"
48+
fi
4249

4350
for path in "${LICENSE_PATHS[@]}"; do
4451
build::common::echo_and_run build::common::copy_if_source_destination_different $path ${OUTPUT_BIN_DIR}/${OS}-${ARCH}/

0 commit comments

Comments
 (0)