mirror of
https://gitlab.archlinux.org/archlinux/archlinux-docker.git
synced 2025-08-06 14:17:18 +02:00
Use the PACKAGE_REGISTRY_URL during releasing
The bug that mandated the get-public-download-for-generic-package.sh use has been fixed a while ago. Directly use the URL variable and drop the no longer needed script. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
parent
ee1b64a7ff
commit
d251908f91
@ -239,8 +239,7 @@ release:
|
|||||||
curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file "output/${rootfs_file}" "${PACKAGE_REGISTRY_URL}/"
|
curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file "output/${rootfs_file}" "${PACKAGE_REGISTRY_URL}/"
|
||||||
echo "Uploading ${rootfs_file}.SHA256"
|
echo "Uploading ${rootfs_file}.SHA256"
|
||||||
curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file "output/${rootfs_file}.SHA256" "${PACKAGE_REGISTRY_URL}/"
|
curl -sSf --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file "output/${rootfs_file}.SHA256" "${PACKAGE_REGISTRY_URL}/"
|
||||||
package_url=$(./ci/get-public-download-for-generic-package.sh ${rootfs_file})
|
./scripts/make-dockerfile.sh "${rootfs_file}" "${group}" "output" "curl -sOJL \"${PACKAGE_REGISTRY_URL}/${rootfs_file}\"" "${group}"
|
||||||
./scripts/make-dockerfile.sh "${rootfs_file}" "${group}" "output" "curl -sOJL \"${package_url}\"" "${group}"
|
|
||||||
sed -i "/^COPY ${rootfs_file} \/$/d" output/Dockerfile.${group}
|
sed -i "/^COPY ${rootfs_file} \/$/d" output/Dockerfile.${group}
|
||||||
done
|
done
|
||||||
- >
|
- >
|
||||||
@ -266,33 +265,17 @@ release:
|
|||||||
"${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/repository/commits"
|
"${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/repository/commits"
|
||||||
- echo "BUILD_COMMIT=$(jq -r '.id' commit-response.json)" >> build.env
|
- echo "BUILD_COMMIT=$(jq -r '.id' commit-response.json)" >> build.env
|
||||||
- |
|
- |
|
||||||
base_url=$(./ci/get-public-download-for-generic-package.sh base-${BUILD_VERSION}.tar.zst)
|
|
||||||
echo "${base_url}"
|
|
||||||
base_sha_url=$(./ci/get-public-download-for-generic-package.sh base-${BUILD_VERSION}.tar.zst.SHA256)
|
|
||||||
echo "${base_sha_url}"
|
|
||||||
base_devel_url=$(./ci/get-public-download-for-generic-package.sh base-devel-${BUILD_VERSION}.tar.zst)
|
|
||||||
echo "${base_devel_url}"
|
|
||||||
base_devel_sha_url=$(./ci/get-public-download-for-generic-package.sh base-devel-${BUILD_VERSION}.tar.zst.SHA256)
|
|
||||||
echo "${base_devel_sha_url}"
|
|
||||||
|
|
||||||
multilib_devel_url=$(./ci/get-public-download-for-generic-package.sh multilib-devel-${BUILD_VERSION}.tar.zst)
|
|
||||||
echo "${multilib_devel_url}"
|
|
||||||
multilib_devel_sha_url=$(./ci/get-public-download-for-generic-package.sh multilib-devel-${BUILD_VERSION}.tar.zst.SHA256)
|
|
||||||
echo "${multilib_devel_sha_url}"
|
|
||||||
|
|
||||||
# TODO: We should actually be able to do something like \"url\":\"${PACKAGE_REGISTRY_URL}/base-${BUILD_VERSION}.tar.zst\"
|
|
||||||
# But it doesn't appear that those downloads are public. I consider this a bug and hopefully it's fixed in a future version!
|
|
||||||
echo "Creating release"
|
echo "Creating release"
|
||||||
release-cli --private-token "${GITLAB_PROJECT_TOKEN}" create \
|
release-cli --private-token "${GITLAB_PROJECT_TOKEN}" create \
|
||||||
--name "Release ${BUILD_VERSION}" \
|
--name "Release ${BUILD_VERSION}" \
|
||||||
--description "Release ${BUILD_VERSION}" \
|
--description "Release ${BUILD_VERSION}" \
|
||||||
--tag-name v${BUILD_VERSION} --ref "releases" \
|
--tag-name v${BUILD_VERSION} --ref "releases" \
|
||||||
--assets-link "{\"name\":\"base-${BUILD_VERSION}.tar.zst\",\"url\":\"${base_url}\"}" \
|
--assets-link "{\"name\":\"base-${BUILD_VERSION}.tar.zst\",\"url\":\"${PACKAGE_REGISTRY_URL}/base-${BUILD_VERSION}.tar.zst\"}" \
|
||||||
--assets-link "{\"name\":\"base-${BUILD_VERSION}.tar.zst.SHA256\",\"url\":\"${base_sha_url}\"}" \
|
--assets-link "{\"name\":\"base-${BUILD_VERSION}.tar.zst.SHA256\",\"url\":\"${PACKAGE_REGISTRY_URL}/base-${BUILD_VERSION}.tar.zst.SHA256\"}" \
|
||||||
--assets-link "{\"name\":\"base-devel-${BUILD_VERSION}.tar.zst\",\"url\":\"${base_devel_url}\"}" \
|
--assets-link "{\"name\":\"base-devel-${BUILD_VERSION}.tar.zst\",\"url\":\"${PACKAGE_REGISTRY_URL}/base-devel-${BUILD_VERSION}.tar.zst\"}" \
|
||||||
--assets-link "{\"name\":\"base-devel-${BUILD_VERSION}.tar.zst.SHA256\",\"url\":\"${base_devel_sha_url}\"}" \
|
--assets-link "{\"name\":\"base-devel-${BUILD_VERSION}.tar.zst.SHA256\",\"url\":\"${PACKAGE_REGISTRY_URL}/base-devel-${BUILD_VERSION}.tar.zst.SHA256\"}" \
|
||||||
--assets-link "{\"name\":\"multilib-devel-${BUILD_VERSION}.tar.zst\",\"url\":\"${multilib_devel_url}\"}" \
|
--assets-link "{\"name\":\"multilib-devel-${BUILD_VERSION}.tar.zst\",\"url\":\"${PACKAGE_REGISTRY_URL}/multilib-devel-${BUILD_VERSION}.tar.zst\"}" \
|
||||||
--assets-link "{\"name\":\"multilib-devel-${BUILD_VERSION}.tar.zst.SHA256\",\"url\":\"${multilib_devel_sha_url}\"}"
|
--assets-link "{\"name\":\"multilib-devel-${BUILD_VERSION}.tar.zst.SHA256\",\"url\":\"${PACKAGE_REGISTRY_URL}/multilib-devel${BUILD_VERSION}.tar.zst.SHA256\"}"
|
||||||
artifacts:
|
artifacts:
|
||||||
reports:
|
reports:
|
||||||
dotenv: build.env
|
dotenv: build.env
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -eu
|
|
||||||
|
|
||||||
package_name=$1
|
|
||||||
|
|
||||||
package_id=$(curl -sSf --header "PRIVATE-TOKEN: ${GITLAB_PROJECT_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages?sort=desc&per_page=1" | jq ".[] | select(.version == \"${BUILD_VERSION}\") | .id")
|
|
||||||
|
|
||||||
if [[ -z "${package_id}" ]]; then
|
|
||||||
>&2 echo "Error: No package id found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
package_file_id=$(curl -sSf --header "PRIVATE-TOKEN: ${GITLAB_PROJECT_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/${package_id}/package_files" | jq ".[] | select(.file_name == \"$package_name\") | .id")
|
|
||||||
|
|
||||||
if [[ -z "${package_file_id}" ]]; then
|
|
||||||
>&2 echo "Error: No package file id found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/${package_file_id}/download"
|
|
Loading…
Reference in New Issue
Block a user