@@ -306,8 +306,10 @@ jobs:
306306 if [[ "${SKIP_SRCBUILD_UPLOAD}" != "YES" ]]; then
307307 #GHCRPKG_TAG_SRCBUILD="srcbuild.$(date --utc +"%y%m%dT%H%M%S" | tr -d '[:space:]')-${{ env.GHCRPKG_TAG }}"
308308 GHCRPKG_TAG_SRCBUILD="${{ env.GHCRPKG_TAG }}"
309- export GHCRPKG_TAG_SRCBUILD
310- [[ "${GHA_MODE}" == "MATRIX" ]] && echo "GHCRPKG_TAG_SRCBUILD=${GHCRPKG_TAG_SRCBUILD}" >> "${GITHUB_ENV}"
309+ GHCRPKG_URL_SRCBUILD="${{ env.GHCRPKG_LOCAL }}/${{ env.PKG_FAMILY_LOCAL }}-srcbuild"
310+ export GHCRPKG_TAG_SRCBUILD GHCRPKG_URL_SRCBUILD
311+ echo "GHCRPKG_TAG_SRCBUILD=${GHCRPKG_TAG_SRCBUILD}" >> "${GITHUB_ENV}"
312+ echo "GHCRPKG_URL_SRCBUILD=${GHCRPKG_URL_SRCBUILD}" >> "${GITHUB_ENV}"
311313 fi
312314 ##Push
313315 if [[ -n "${GHCRPKG_TAG_SRCBUILD+x}" ]]; then
@@ -337,28 +339,28 @@ jobs:
337339 ghcr_push+=(--annotation "org.opencontainers.image.url=${{ env.PKG_SRCURL }}")
338340 ghcr_push+=(--annotation "org.opencontainers.image.vendor=pkgforge")
339341 ghcr_push+=(--annotation "org.opencontainers.image.version=${{ env.PKG_VERSION }}")
340- ghcr_push+=("${{ env.GHCRPKG_URL }}-srcbuild :${GHCRPKG_TAG_SRCBUILD}")
342+ ghcr_push+=("${GHCRPKG_URL_SRCBUILD} :${GHCRPKG_TAG_SRCBUILD}")
341343 [[ -f "./BUILD_ARTIFACTS.7z" && -s "./BUILD_ARTIFACTS.7z" ]] && ghcr_push+=("./BUILD_ARTIFACTS.7z")
342344 "${ghcr_push[@]}" ; sleep 5
343345 #Check
344- if [[ "$(oras manifest fetch "${{ env.GHCRPKG_URL }}-srcbuild :${GHCRPKG_TAG_SRCBUILD}" | jq -r '.annotations["dev.pkgforge.soar.push_date"]' | tr -d '[:space:]')" == "${{ env.PKG_DATE }}" ]]; then
345- echo -e "\n[+] (ARTIFACTS) Registry --> https://${{ env.GHCRPKG_URL }}-srcbuild \n"
346+ if [[ "$(oras manifest fetch "${GHCRPKG_URL_SRCBUILD} :${GHCRPKG_TAG_SRCBUILD}" | jq -r '.annotations["dev.pkgforge.soar.push_date"]' | tr -d '[:space:]')" == "${{ env.PKG_DATE }}" ]]; then
347+ echo -e "\n[+] (ARTIFACTS) Registry --> https://${GHCRPKG_URL_SRCBUILD} \n"
346348 break
347349 else
348- echo -e "\n[-] Failed to Push Artifact to ${{ env.GHCRPKG_URL }}-srcbuild :${GHCRPKG_TAG_SRCBUILD} (Retrying ${i}/10)\n"
350+ echo -e "\n[-] Failed to Push Artifact to ${GHCRPKG_URL_SRCBUILD} :${GHCRPKG_TAG_SRCBUILD} (Retrying ${i}/10)\n"
349351 fi
350352 sleep "$(shuf -i 500-4500 -n 1)e-3"
351353 done
352354 }
353355 export -f ghcr_push_cmd
354356 ghcr_push_cmd
355- if [[ "$(oras manifest fetch "${{ env.GHCRPKG_URL }}-srcbuild :${GHCRPKG_TAG_SRCBUILD}" | jq -r '.annotations["dev.pkgforge.soar.push_date"]' | tr -d '[:space:]')" != "${{ env.PKG_DATE }}" ]]; then
356- echo -e "\n[✗] Failed to Push Artifact to ${{ env.GHCRPKG_URL }}-srcbuild :${GHCRPKG_TAG_SRCBUILD}\n"
357+ if [[ "$(oras manifest fetch "${GHCRPKG_URL_SRCBUILD} :${GHCRPKG_TAG_SRCBUILD}" | jq -r '.annotations["dev.pkgforge.soar.push_date"]' | tr -d '[:space:]')" != "${{ env.PKG_DATE }}" ]]; then
358+ echo -e "\n[✗] Failed to Push Artifact to ${GHCRPKG_URL_SRCBUILD} :${GHCRPKG_TAG_SRCBUILD}\n"
357359 echo -e "\n[-] Retrying ...\n"
358360 ghcr_push_cmd
359- if [[ "$(oras manifest fetch "${{ env.GHCRPKG_URL }}-srcbuild :${GHCRPKG_TAG_SRCBUILD}" | jq -r '.annotations["dev.pkgforge.soar.push_date"]' | tr -d '[:space:]')" != "${{ env.PKG_DATE }}" ]]; then
360- oras manifest fetch "${{ env.GHCRPKG_URL }}-srcbuild :${GHCRPKG_TAG_SRCBUILD}" | jq .
361- echo -e "\n[✗] Failed to Push Artifact to ${{ env.GHCRPKG_URL }}-srcbuild :${GHCRPKG_TAG_SRCBUILD}\n"
361+ if [[ "$(oras manifest fetch "${GHCRPKG_URL_SRCBUILD} :${GHCRPKG_TAG_SRCBUILD}" | jq -r '.annotations["dev.pkgforge.soar.push_date"]' | tr -d '[:space:]')" != "${{ env.PKG_DATE }}" ]]; then
362+ oras manifest fetch "${GHCRPKG_URL_SRCBUILD} :${GHCRPKG_TAG_SRCBUILD}" | jq .
363+ echo -e "\n[✗] Failed to Push Artifact to ${GHCRPKG_URL_SRCBUILD} :${GHCRPKG_TAG_SRCBUILD}\n"
362364 return 1 || exit 1
363365 fi
364366 fi
0 commit comments