[gimp/wip/Jehan/gitlab-ci-win-32-bit: 7/7] Add a distribution job with Win 32-bit!
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/Jehan/gitlab-ci-win-32-bit: 7/7] Add a distribution job with Win 32-bit!
- Date: Sun, 9 May 2021 14:04:31 +0000 (UTC)
commit 3f71c8eac690649d79ce0fa4cd4a8bd9e5ed4530
Author: Jehan <jehan girinstud io>
Date: Sun May 9 16:03:53 2021 +0200
Add a distribution job with Win 32-bit!
.gitlab-ci.yml | 22 ++++++++++++++++++++++
build/windows/gitlab-ci/package-gimp-msys2.sh | 10 +++++++---
2 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dde74f710d..78b194db07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -465,6 +465,28 @@ win64-native-nightly:
- C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/package-gimp-msys2.sh"
needs: ["gimp-win64-native"]
+win32-native-nightly:
+ rules:
+ - if: '$CI_COMMIT_TAG == null && $CI_PIPELINE_SOURCE != "schedule"'
+ variables:
+ MSYSTEM: "MINGW32"
+ CHERE_INVOKING: "yes"
+ tags:
+ - win32-ps
+ stage: distribution
+ dependencies:
+ - gimp-win32-native
+ artifacts:
+ name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
+ when: always
+ expire_in: 2 days
+ paths:
+ - gimp-w32
+ script:
+ - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
+ - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/package-gimp-msys2.sh"
+ needs: ["gimp-win32-native"]
+
sources:
except:
- schedules
diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh
index 89d0f49857..3d5f1bde8a 100644
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@@ -4,8 +4,14 @@ set -e
if [[ "$MSYSTEM" == "MINGW32" ]]; then
export MSYS2_ARCH="i686"
+ export MSYS_PREFIX="/c/msys64/mingw32/"
+ export PATH="/mingw32/bin:$PATH"
+ export GIMP_DISTRIB=`realpath ./gimp-w32`
else
export MSYS2_ARCH="x86_64"
+ export MSYS_PREFIX="/c/msys64/mingw64/"
+ export PATH="/mingw64/bin:$PATH"
+ export GIMP_DISTRIB=`realpath ./gimp-w64`
fi
# Why do we even have to remove these manually? The whole thing is
@@ -71,9 +77,7 @@ pacman --noconfirm -S --needed \
mingw-w64-$MSYS2_ARCH-xpm-nox
export GIMP_PREFIX=`realpath ./_install`
-export GIMP_DISTRIB=`realpath ./gimp-w64`
-export MSYS_PREFIX="/c/msys64/mingw64/"
-export PATH="$GIMP_PREFIX/bin:/mingw64/bin:$PATH"
+export PATH="$GIMP_PREFIX/bin:$PATH"
# Package ressources.
mkdir -p ${GIMP_DISTRIB}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]