From 429a97497e8c06b72d440bf7596338e59f3ea30a Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Wed, 20 Nov 2024 10:21:37 +0100 Subject: [PATCH] CI: Update GitLab example. Signed-off-by: Simon Josefsson --- web/docs/ci.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/docs/ci.md b/web/docs/ci.md index 2c719c11..18a7bc59 100644 --- a/web/docs/ci.md +++ b/web/docs/ci.md @@ -42,7 +42,7 @@ see https://github.com/marketplace/actions/setup-msys2 ## GitLab -GitLab offers [shared Windows runners](https://docs.gitlab.com/ee/ci/runners/saas/windows_saas_runner.html) +GitLab offers [shared Windows runners](https://docs.gitlab.com/ee/ci/runners/hosted_runners/windows.html) with some [pre-installed software](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/gcp/windows-containers/blob/main/cookbooks/preinstalled-software/README.md) and you can build a project using the following `.gitlab-ci.yml` snippet, which illustrates how to build a regular autotools-based @@ -52,7 +52,7 @@ for general reference on CI/CD in GitLab. ```yaml Windows-MSYS2-UCRT64: # https://docs.gitlab.com/ee/ci/runners/saas/windows_saas_runner.html - tags: [ shared-windows, windows-1809 ] + tags: [ saas-windows-medium-amd64 ] script: # https://www.msys2.org/docs/ci/#gitlab - wget.exe -nv -O msys2.exe https://github.com/msys2/msys2-installer/releases/download/nightly-x86_64/msys2-base-x86_64-latest.sfx.exe - ./msys2.exe -y -oC:\ @@ -63,7 +63,7 @@ Windows-MSYS2-UCRT64: - C:\msys64\usr\bin\bash -lc 'pacman --noconfirm -Syuu' - C:\msys64\usr\bin\bash -lc 'pacman --noconfirm -Syuu' - | - C:\msys64\usr\bin\bash -lc ' + C:\msys64\usr\bin\bash -lcx ' pacman --noconfirm -Syu git mingw-w64-ucrt-x86_64-autotools mingw-w64-ucrt-x86_64-gcc ./bootstrap ./configure