summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Petridis <jordan@centricular.com>2021-09-09 13:26:01 +0300
committerJordan Petridis <jordan@centricular.com>2021-09-10 18:25:08 +0300
commitab610be59d1a8d9f364da1cd72bdbf5a15bcf289 (patch)
tree81d710219863748cd2c8e2432ce309b2150f9e96
parentd94c24b39004ee5b25d910b967a46681d7365d0f (diff)
citemplate: post-merge use upstream urls for fetching scripts
since gstreamer/gst-ci!414 landed Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/416>
-rw-r--r--gitlab/ci_template.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index ac0e287..8f06c1a 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -67,9 +67,7 @@ variables:
# Can't use $CI_* variables since we use this template in all repos, not just gst-ci
CERBERO_SCRIPT_URL: "https://gitlab.freedesktop.org/gstreamer/gst-ci/raw/${GST_UPSTREAM_BRANCH}/gitlab/cerbero_setup.sh"
- # FIXME: fix the file path url to point to the upstram once merged
- # WINDOWS_CONTAINER_SCRIPT_URL: "https://gitlab.freedesktop.org/gstreamer/gst-ci/raw/${GST_UPSTREAM_BRANCH}/docker/windows/container.ps1"
- WINDOWS_CONTAINER_SCRIPT_URL: "https://gitlab.freedesktop.org/alatiera/gst-ci/raw/alatiera/windows-rs-wip/docker/windows/container.ps1"
+ WINDOWS_CONTAINER_SCRIPT_URL: "https://gitlab.freedesktop.org/gstreamer/gst-ci/raw/${GST_UPSTREAM_BRANCH}/docker/windows/container.ps1"
GIT_STRATEGY: none
MESON_BUILDTYPE_ARGS: --default-library=both