diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-01 09:53:02 +0000 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-01 09:53:02 +0000 |
| commit | ff5d15850aa0aab31a11624a4728943f00011706 (patch) | |
| tree | 421d388bf7548d22756b65cb8e09d6ed886dfaa7 | |
| parent | 17b79d206dd6d391e754975f38e5352f282f86d1 (diff) | |
| parent | 8336ecd87c950052853bb42fc9c2389992615ba4 (diff) | |
| download | pango-ff5d15850aa0aab31a11624a4728943f00011706.tar.gz | |
Merge branch 'new-win32-runners' into 'master'
CI: Switch to new Windows runners
See merge request GNOME/pango!187
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee379f24..5d4a265f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ linux-fedora: msys2-mingw64: stage: build tags: - - win32 + - win32-ps variables: MSYSTEM: "MINGW64" CHERE_INVOKING: "yes" @@ -44,7 +44,7 @@ msys2-mingw64: - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/render-msys2.sh" - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/list-msys2.sh" artifacts: - name: "%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%" + name: "${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}" when: always paths: - _build/meson-logs |