[meld/windows-font-fixes: 6/7] CI: Switch to new win32-ps runner for windows builds
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/windows-font-fixes: 6/7] CI: Switch to new win32-ps runner for windows builds
- Date: Fri, 22 May 2020 23:41:28 +0000 (UTC)
commit af54fb6a8c2c009fce253c01ac399dd499872940
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun May 17 08:39:26 2020 +1000
CI: Switch to new win32-ps runner for windows builds
This switches the build shell to PowerShell, so needs changes to
environment variable syntax.
The variable quoting changes aren't required, they're just for
consistency.
.gitlab-ci.yml | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abc76e50..faa69234 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,14 +46,22 @@ pytest:
.mingw-common:
stage: build
tags: # select gitlab runners with specific tag (unrelated to git repo tags)
- - win32
+ - win32-ps
artifacts:
- name: "%CI_JOB_STAGE%-%CI_COMMIT_REF_NAME%"
+ name: "${env:CI_JOB_STAGE}-${env:CI_COMMIT_REF_NAME}"
paths:
- dist/
before_script:
- - path C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%PATH%
- - pacman --noconfirm -S --refresh --sysupgrade --needed mingw-w64-%MSYS2_ARCH%-python3-cx_Freeze
mingw-w64-%MSYS2_ARCH%-python3-gobject mingw-w64-%MSYS2_ARCH%-python3-pytest
mingw-w64-%MSYS2_ARCH%-gtksourceview4 mingw-w64-%MSYS2_ARCH%-gsettings-desktop-schemas glib2-devel intltool
+ - $env:Path = "C:\msys64\${env:MSYSTEM}\bin;C:\msys64\usr\bin;${env:PATH}"
+ - >
+ C:\msys64\usr\bin\pacman --noconfirm -S --refresh --sysupgrade --needed
+ mingw-w64-${env:MSYS2_ARCH}-python3-cx_Freeze
+ mingw-w64-${env:MSYS2_ARCH}-python3-gobject
+ mingw-w64-${env:MSYS2_ARCH}-python3-pytest
+ mingw-w64-${env:MSYS2_ARCH}-gtksourceview4
+ mingw-w64-${env:MSYS2_ARCH}-gsettings-desktop-schemas
+ glib2-devel
+ intltool
script:
- glib-compile-schemas data
- python3 setup_win32.py bdist_dumb --bdist-dir build\bdist.mingw\msi --keep-temp bdist_msi --keep-temp
@@ -64,11 +72,13 @@ pytest:
mingw64-dist:
extends: .mingw-common
variables:
- MSYS2_ARCH: x86_64
- MSYSTEM: MINGW64
+ MSYS2_ARCH: "x86_64"
+ MSYSTEM: "MINGW64"
+ CHERE_INVOKING: "yes"
mingw32-dist:
extends: .mingw-common
variables:
- MSYS2_ARCH: i686
+ MSYS2_ARCH: "i686"
MSYSTEM: "MINGW32"
+ CHERE_INVOKING: "yes"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]