[Android] Update gitlab CI config
Geoffrey Métais
git at videolan.org
Sun Dec 29 11:33:48 CET 2019
vlc-android | branch: master | Geoffrey Métais <geoffrey at videolan.org> | Sun Dec 29 11:33:46 2019 +0100| [0af5c261ecfbf2df95c9fb33487d28fe59b49e07] | committer: Geoffrey Métais
Update gitlab CI config
> https://code.videolan.org/videolan/vlc-android/commit/0af5c261ecfbf2df95c9fb33487d28fe59b49e07
---
buildsystem/gitlab/.gitlab-ci.yml | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index a1a26eea4..2750a8bca 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -12,7 +12,7 @@ cache:
- android
stage: build
script:
- - ./compile.sh ${EXTRA_BUILD_PARAM} -a ${ARCH}
+ - ./buildsystem/compile.sh ${EXTRA_BUILD_PARAM} -a ${ARCH}
variables:
MAKEFLAGS: -j8
@@ -42,10 +42,7 @@ cache:
- merge_requests
changes:
- medialibrary/**/*
- - compile.sh
- - build-common
- - compile-libvlc.sh
- - compile-medialibrary.sh
+ - buildsystem/**/*
except:
- schedules
variables:
@@ -55,7 +52,7 @@ cache:
continuous-app-build:
extends: .build-all-base
script:
- - ./compile.sh --init
+ - ./buildsystem/compile.sh --init
- ./gradlew assembleDebug
only:
refs:
@@ -63,16 +60,13 @@ continuous-app-build:
- merge_requests
changes:
- vlc-android/**/*
- - assets/**/*
- - .gitlab-ci.yml
+ - resources/assets/**/*
+ - ./buildsystem/gitlab/gitlab-ci.yml
except:
refs:
- schedules
changes:
- - build-common
- - compile-libvlc.sh
- - compile-medialibrary.sh
- - compile.sh
+ - buildsystem/**/*
- libvlc/**/*
- medialibrary/**/*
More information about the Android
mailing list