Browse Source

Update gitlab CI config

merge-requests/382/head
Geoffrey Métais 7 years ago
parent
commit
0af5c261ec
  1. 18
      buildsystem/gitlab/.gitlab-ci.yml

18
buildsystem/gitlab/.gitlab-ci.yml

@ -12,7 +12,7 @@ cache:
- android - android
stage: build stage: build
script: script:
- ./compile.sh ${EXTRA_BUILD_PARAM} -a ${ARCH} - ./buildsystem/compile.sh ${EXTRA_BUILD_PARAM} -a ${ARCH}
variables: variables:
MAKEFLAGS: -j8 MAKEFLAGS: -j8
@ -42,10 +42,7 @@ cache:
- merge_requests - merge_requests
changes: changes:
- medialibrary/**/* - medialibrary/**/*
- compile.sh - buildsystem/**/*
- build-common
- compile-libvlc.sh
- compile-medialibrary.sh
except: except:
- schedules - schedules
variables: variables:
@ -55,7 +52,7 @@ cache:
continuous-app-build: continuous-app-build:
extends: .build-all-base extends: .build-all-base
script: script:
- ./compile.sh --init - ./buildsystem/compile.sh --init
- ./gradlew assembleDebug - ./gradlew assembleDebug
only: only:
refs: refs:
@ -63,16 +60,13 @@ continuous-app-build:
- merge_requests - merge_requests
changes: changes:
- vlc-android/**/* - vlc-android/**/*
- assets/**/* - resources/assets/**/*
- .gitlab-ci.yml - ./buildsystem/gitlab/gitlab-ci.yml
except: except:
refs: refs:
- schedules - schedules
changes: changes:
- build-common - buildsystem/**/*
- compile-libvlc.sh
- compile-medialibrary.sh
- compile.sh
- libvlc/**/* - libvlc/**/*
- medialibrary/**/* - medialibrary/**/*

Loading…
Cancel
Save