citemplate: post-merge use upstream urls for fetching scripts
authorJordan Petridis <jordan@centricular.com>
Thu, 9 Sep 2021 10:26:01 +0000 (13:26 +0300)
committerJordan Petridis <jordan@centricular.com>
Fri, 10 Sep 2021 15:25:08 +0000 (18:25 +0300)
since gstreamer/gst-ci!414 landed

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/416>

gitlab/ci_template.yml

index ac0e287..8f06c1a 100644 (file)
@@ -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