ci: use https:// to install ci-fairy
There's no reason to try to use http://, not that it would work as it's 301-redirected to https:// anyway. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34451>
This commit is contained in:
committed by
Marge Bot
parent
7d5f0eebc6
commit
580a151642
@@ -87,7 +87,7 @@ apt-get update
|
||||
apt-get -y install "${DEPS[@]}" "${EPHEMERAL[@]}"
|
||||
|
||||
# Needed for ci-fairy s3cp
|
||||
pip3 install --break-system-packages "ci-fairy[s3] @ git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
|
||||
pip3 install --break-system-packages "ci-fairy[s3] @ git+https://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
|
||||
|
||||
arch=armhf
|
||||
. .gitlab-ci/container/cross_build.sh
|
||||
|
||||
@@ -158,7 +158,7 @@ apt-get install -y --no-install-recommends "${EPHEMERAL[@]}"
|
||||
. .gitlab-ci/container/container_pre_build.sh
|
||||
|
||||
# Needed for ci-fairy s3cp
|
||||
pip3 install --break-system-packages "ci-fairy[s3] @ git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
|
||||
pip3 install --break-system-packages "ci-fairy[s3] @ git+https://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
|
||||
|
||||
# Needed for manipulation with traces yaml files.
|
||||
pip3 install --break-system-packages yq
|
||||
|
||||
@@ -100,7 +100,7 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
|
||||
. .gitlab-ci/container/build-libclc.sh
|
||||
|
||||
# Needed for ci-fairy s3cp
|
||||
pip3 install --break-system-packages "ci-fairy[s3] @ git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
|
||||
pip3 install --break-system-packages "ci-fairy[s3] @ git+https://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
|
||||
|
||||
. .gitlab-ci/container/install-meson.sh
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ apt-get install -y --no-remove --no-install-recommends "${DEPS[@]}" "${EPHEMERAL
|
||||
"${EXTRA_LOCAL_PACKAGES:-}"
|
||||
|
||||
# Needed for ci-fairy s3cp
|
||||
pip3 install --break-system-packages "ci-fairy[s3] @ git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
|
||||
pip3 install --break-system-packages "ci-fairy[s3] @ git+https://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
|
||||
|
||||
pip3 install --break-system-packages -r bin/ci/test/requirements.txt
|
||||
|
||||
|
||||
Reference in New Issue
Block a user