diff options
| author | Jordan Petridis <jordan@centricular.com> | 2022-03-01 21:12:02 +0200 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-03-02 06:17:35 +0000 |
| commit | 303d2a9ab78a4aa92675c7c608bc69708db7ed4e (patch) | |
| tree | 91530157edcd857dd39373e87f6b6d0b828e4e9d /.gitlab-ci.yml | |
| parent | c4ac6573647f8d5026327ad3c5b362bf13308e60 (diff) | |
| download | gstreamer-303d2a9ab78a4aa92675c7c608bc69708db7ed4e.tar.gz | |
Revert "ci: Disable windows jobs for now"
This reverts commit be2815a07a0df7a33d136a2be9cccd0969808642.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1827>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5b80d32bb..4f0d0b2c18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -163,7 +163,7 @@ gst-indent amd64 docker: # Do not depend on the trigger, as we want to run indent always needs: [] -.windows amd64 docker: +windows amd64 docker: stage: "build docker" needs: - "trigger" @@ -224,14 +224,14 @@ gst-indent amd64 docker: Exit 1 } -.windows rust amd64 docker latest stable: +windows rust amd64 docker latest stable: extends: '.windows rust docker build' variables: RUST_IMAGE: !reference [variables, "WINDOWS_RUST_LATEST_IMAGE"] RUST_UPSTREAM_IMAGE: !reference [variables, "WINDOWS_RUST_LATEST_UPSTREAM_IMAGE"] RUST_VERSION: !reference [variables, "RUST_LATEST_VERSION"] -.windows rust amd64 docker minimum supported version: +windows rust amd64 docker minimum supported version: extends: '.windows rust docker build' variables: RUST_IMAGE: !reference [variables, "WINDOWS_RUST_MINIMUM_IMAGE"] @@ -416,17 +416,17 @@ build clang fedora x86_64: # - 'build/meson-logs/' # - 'vslogs.zip' -.build vs2019 amd64: +build vs2019 amd64: extends: '.build windows' variables: ARCH: 'amd64' -.build vs2019 x86: +build vs2019 x86: extends: '.build windows' variables: ARCH: 'x86' -.build vs2019 arm64 uwp: +build vs2019 arm64 uwp: extends: '.build windows' variables: ARCH: 'arm64' @@ -439,7 +439,7 @@ build clang fedora x86_64: --cross-file ci/meson/vs2019-arm64-cross-file.txt --native-file ci/meson/vs2019-x64-native-file.txt -.build msys2 : +build msys2 : extends: '.build windows' timeout: '60min' rules: |