diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-03 20:50:08 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-03 20:56:55 +0200 |
| commit | cd60c7d1e0d7ecf6876e33334918dd5ab1dc957a (patch) | |
| tree | 0fe83704a35e84e706679afef249b1c72e840803 | |
| parent | 9b63929e8c329d7f3293327fc301cd5327de19d5 (diff) | |
| download | gobject-introspection-gnome-3-36.tar.gz | |
CI: switch to new win32 runnersgnome-3-36
powershell instead of cmd, win2016 instead of 2012r2
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .gitlab-ci/test-msvc.bat | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16a8f3bb..0cb71530 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ fedora-x86_64-python3.5: msys2-mingw32-meson: stage: build tags: - - win32 + - win32-ps variables: MSYSTEM: "MINGW32" CHERE_INVOKING: "yes" @@ -88,19 +88,19 @@ msys2-mingw32-meson: - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-meson.sh" artifacts: when: on_failure - name: "gi-_%CI_COMMIT_REF_NAME%" + name: "gi-_${env:CI_COMMIT_REF_NAME}" paths: - _build/meson-logs vs2017-x64-meson: stage: build tags: - - win32 + - win32-ps script: - .gitlab-ci/test-msvc.bat artifacts: when: on_failure - name: "gi-_%CI_COMMIT_REF_NAME%" + name: "gi-_${env:CI_COMMIT_REF_NAME}" paths: - _build/meson-logs diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index a2ee44b2..549d4fd1 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -1,5 +1,5 @@ @echo on -call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 +call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64 @echo on py -3 -c "import urllib.request, sys; urllib.request.urlretrieve(*sys.argv[1:])" "https://github.com/lexxmark/winflexbison/releases/download/v2.5.14/win_flex_bison-2.5.14.zip" win_flex_bison.zip |