diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-07-07 11:38:51 +0530 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2023-07-17 05:52:08 +0000 |
| commit | b5c3b9927a193d7f62ed89b3d2eabe2a27085cbd (patch) | |
| tree | 469257c0d9e6cb84186fe41cabbaf92c71e63b15 /.gitlab-ci.yml | |
| parent | 14e4f866994d64a0dd53faa2e71ab33ceb501268 (diff) | |
ci: Use MSYS2 instead of MSYS for CI
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1216>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9fa4336..fc90c170 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -492,20 +492,19 @@ cerbero cross-ios universal examples: CERBERO_BOOTSTRAP_SYSTEM: "no" HAVE_CCACHE: "" before_script: - - $env:CI_PROJECT_DIR = $env:CI_PROJECT_DIR.replace('\', '/') - - C:\MinGW\msys\1.0\bin\bash.exe --login -c "cd $env:CI_PROJECT_DIR && ./ci/cerbero_setup.sh cerbero_before_script" + - C:\msys64\msys2_shell.cmd -ucrt64 -defterm -no-start -here -use-full-path -lc "./ci/cerbero_setup.sh cerbero_before_script" cerbero deps msvc x86_64: extends: ['.cerbero deps', '.cerbero windows native'] script: - - C:\MinGW\msys\1.0\bin\bash.exe --login -c "cd $env:CI_PROJECT_DIR && ./ci/cerbero_setup.sh cerbero_deps_script" + - C:\msys64\msys2_shell.cmd -ucrt64 -defterm -no-start -here -use-full-path -lc "./ci/cerbero_setup.sh cerbero_deps_script" cerbero deps msvc x86_64 msi package: extends: ['.cerbero deps', '.cerbero windows native'] variables: CERBERO_PACKAGE_ARGS: "" script: - - C:\MinGW\msys\1.0\bin\bash.exe --login -c "cd $env:CI_PROJECT_DIR && ./ci/cerbero_setup.sh cerbero_deps_script" + - C:\msys64\msys2_shell.cmd -ucrt64 -defterm -no-start -here -use-full-path -lc "./ci/cerbero_setup.sh cerbero_deps_script" artifacts: name: "${CI_JOB_NAME}_${CI_COMMIT_SHA}" expire_in: '5 days' @@ -521,7 +520,7 @@ cerbero deps msvc x86_64 msi package: build cerbero msvc x86_64: extends: ['.cerbero mr', '.cerbero windows native'] script: - - C:\MinGW\msys\1.0\bin\bash.exe --login -c "cd $env:CI_PROJECT_DIR && ./ci/cerbero_setup.sh cerbero_script" + - C:\msys64\msys2_shell.cmd -ucrt64 -defterm -no-start -here -use-full-path -lc "./ci/cerbero_setup.sh cerbero_script" # FIXME: UWP build is disabled until build issues with latest GLib version are sorted out cerbero deps uwp universal: @@ -531,8 +530,8 @@ cerbero deps uwp universal: ARCH: 'uwp_universal' CERBERO_ARGS: "${DEFAULT_CERBERO_ARGS} -v nowerror" script: - - C:\MinGW\msys\1.0\bin\bash.exe --login -c "cd $env:CI_PROJECT_DIR && ./ci/cerbero_setup.sh cerbero_deps_script" - - C:\MinGW\msys\1.0\bin\bash.exe --login -c "cd $env:CI_PROJECT_DIR && CERBERO_ARGS='$env:CERBERO_ARGS,vscrt=mdd' && ./ci/cerbero_setup.sh cerbero_deps_script" + - C:\msys64\msys2_shell.cmd -ucrt64 -defterm -no-start -here -use-full-path -lc "./ci/cerbero_setup.sh cerbero_deps_script" + - C:\msys64\msys2_shell.cmd -ucrt64 -defterm -no-start -here -use-full-path -lc "CERBERO_ARGS='$CERBERO_ARGS,vscrt=mdd' && ./ci/cerbero_setup.sh cerbero_deps_script" when: 'manual' # FIXME: UWP build is disabled until build issues with latest GLib version are sorted out @@ -543,6 +542,6 @@ build cerbero uwp universal: ARCH: 'uwp_universal' CERBERO_ARGS: "${DEFAULT_CERBERO_ARGS} -v nowerror" script: - - C:\MinGW\msys\1.0\bin\bash.exe --login -c "cd $env:CI_PROJECT_DIR && ./ci/cerbero_setup.sh cerbero_script" - - C:\MinGW\msys\1.0\bin\bash.exe --login -c "cd $env:CI_PROJECT_DIR && CERBERO_ARGS='$env:CERBERO_ARGS,vscrt=mdd' && ./ci/cerbero_setup.sh cerbero_script" + - C:\msys64\msys2_shell.cmd -ucrt64 -defterm -no-start -here -use-full-path -lc "./ci/cerbero_setup.sh cerbero_script" + - C:\msys64\msys2_shell.cmd -ucrt64 -defterm -no-start -here -use-full-path -lc "CERBERO_ARGS='$CERBERO_ARGS,vscrt=mdd' && ./ci/cerbero_setup.sh cerbero_script" when: 'manual' |