procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 09:53:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

gitlab-ci: job renaming.

Browse source
This commit is contained in:
Jehan 2019-11-25 19:16:40 +01:00
parent c8ec0ae7fa
commit 39e6670c7c
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
.gitlab-ci.yml
View file

@ -12,7 +12,7 @@ variables:
## GNU/Linux 64-bit CIs ## ## GNU/Linux 64-bit CIs ##
deps-git: deps-linux:
stage: dependencies stage: dependencies
cache: cache:
paths: paths:
@ -65,7 +65,7 @@ deps-git:
.gimp-base: .gimp-base:
stage: gimp stage: gimp
dependencies: dependencies:
- deps-git - deps-linux
artifacts: artifacts:
expire_in: 1 week expire_in: 1 week
when: always when: always
@ -113,8 +113,9 @@ deps-git:
intltool intltool
iso-codes iso-codes
xorg-server-xvfb xorg-server-xvfb
needs: ["deps-linux"]
gimp-autotools: gimp-linux-autotools:
extends: .gimp-base extends: .gimp-base
script: script:
- mkdir _build - mkdir _build
@ -127,9 +128,8 @@ gimp-autotools:
--with-lua=force --with-lua=force
- make -j "$(nproc)" - make -j "$(nproc)"
# - make check # - make check
needs: ["deps-git"]
gimp-meson: gimp-linux-meson:
extends: .gimp-base extends: .gimp-base
script: script:
- meson _build - meson _build
@ -139,11 +139,10 @@ gimp-meson:
-Dlua=always -Dlua=always
- ninja -C _build - ninja -C _build
# - ninja test # - ninja test
needs: ["deps-git"]
## WINDOWS 64-bit CI ## ## WINDOWS 64-bit CI ##
deps-x86_64-w64-mingw32: deps-win64:
image: fedora:31 image: fedora:31
stage: dependencies stage: dependencies
variables: variables:
@ -200,11 +199,11 @@ deps-x86_64-w64-mingw32:
- .local/ - .local/
- _deps/ - _deps/
gimp-x86_64-w64-mingw32-meson: gimp-win64:
image: fedora:31 image: fedora:31
stage: gimp stage: gimp
dependencies: dependencies:
- deps-x86_64-w64-mingw32 - deps-win64
variables: variables:
XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/" XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
XDG_DATA_HOME: "$CI_PROJECT_DIR/.local/share/" XDG_DATA_HOME: "$CI_PROJECT_DIR/.local/share/"
@ -248,7 +247,7 @@ gimp-x86_64-w64-mingw32-meson:
cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/ cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
' | ' |
crossroad w64 gimp --run="-" crossroad w64 gimp --run="-"
needs: ["deps-x86_64-w64-mingw32"] needs: ["deps-win64"]
artifacts: artifacts:
name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: always when: always
@ -259,7 +258,7 @@ gimp-x86_64-w64-mingw32-meson:
## WINDOWS 32-bit CI ## ## WINDOWS 32-bit CI ##
deps-i686-w64-mingw32: deps-win32:
image: fedora:31 image: fedora:31
stage: dependencies stage: dependencies
variables: variables:
@ -316,11 +315,11 @@ deps-i686-w64-mingw32:
- .local/ - .local/
- _deps/ - _deps/
gimp-i686-w64-mingw32-meson: gimp-win32:
image: fedora:31 image: fedora:31
stage: gimp stage: gimp
dependencies: dependencies:
- deps-x86_64-w64-mingw32 - deps-win32
variables: variables:
XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/" XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
XDG_DATA_HOME: "$CI_PROJECT_DIR/.local/share/" XDG_DATA_HOME: "$CI_PROJECT_DIR/.local/share/"
@ -365,6 +364,7 @@ gimp-i686-w64-mingw32-meson:
cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/ cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
' | ' |
crossroad w32 gimp --run="-" crossroad w32 gimp --run="-"
needs: ["deps-win32"]
artifacts: artifacts:
name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: always when: always