From bc7f2feb5b6e93fac19fe7f0fc7ed3cc13cd233a Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 5 Dec 2019 00:49:40 +0200 Subject: [PATCH] windows: fix invalid powershell syntax ``` At line:1 char:34 + cd $env:CI_PROJECT_DIR/gst-build && python git-update --no-interactio ... + ~~ The token '&&' is not a valid statement separator in this version. + CategoryInfo : ParserError: (:) [], ParentContainsErrorRecordEx ception + FullyQualifiedErrorId : InvalidEndOfLine ``` This is not bash, but powershell, hue hue hue --- gitlab/ci_template.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index e846c6169a..625f06ab06 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -429,7 +429,7 @@ valgrind ges: - cd $env:CI_PROJECT_DIR/gst-build - cp -r C:/subprojects/* subprojects/ # Run the git-update script and feed it the manifest to setup the environment - - cd $env:CI_PROJECT_DIR/gst-build && python git-update --no-interaction --manifest=$env:CI_PROJECT_DIR/manifest.xml + - cd $env:CI_PROJECT_DIR/gst-build; python git-update --no-interaction --manifest=$env:CI_PROJECT_DIR/manifest.xml # For some reason, options are separated by newline instead of space, so we # have to replace them first. - $env:MESON_ARGS = $env:MESON_ARGS.replace("`n"," ") @@ -483,7 +483,7 @@ build msys2 : - cp -r C:\subprojects\* subprojects\ # Run the git-update script and feed it the manifest to setup the environment - - cd $env:CI_PROJECT_DIR/gst-build && python git-update --no-interaction --manifest=$env:CI_PROJECT_DIR/manifest.xml + - cd $env:CI_PROJECT_DIR/gst-build; python git-update --no-interaction --manifest=$env:CI_PROJECT_DIR/manifest.xml # For some reason, options are separated by newline instead of space, so we # have to replace them first. - $env:MESON_ARGS = $env:MESON_ARGS.replace("`n"," ")