From 78dcfb7c95fd17c8ee04f4c357b1c9b0a46cb0af Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 2 Apr 2020 13:59:16 -0300 Subject: Prevent parallel deploys to nightly repo --- cashier/.gitlab-ci.yml | 3 +++ merchant-terminal/.gitlab-ci.yml | 3 +++ wallet/.gitlab-ci.yml | 11 ++++++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cashier/.gitlab-ci.yml b/cashier/.gitlab-ci.yml index 792f3c5..e5f02ad 100644 --- a/cashier/.gitlab-ci.yml +++ b/cashier/.gitlab-ci.yml @@ -5,6 +5,8 @@ cashier_test: only: changes: - cashier/**/* + - taler-kotlin-common/**/* + - build.gradle script: ./gradlew :cashier:lint :cashier:assembleRelease artifacts: paths: @@ -13,6 +15,7 @@ cashier_test: cashier_deploy_nightly: stage: deploy + resource_group: deploy_nightly only: refs: - master diff --git a/merchant-terminal/.gitlab-ci.yml b/merchant-terminal/.gitlab-ci.yml index 9bd889b..76f25ad 100644 --- a/merchant-terminal/.gitlab-ci.yml +++ b/merchant-terminal/.gitlab-ci.yml @@ -3,6 +3,8 @@ merchant_test: only: changes: - merchant-terminal/**/* + - taler-kotlin-common/**/* + - build.gradle script: ./gradlew :merchant-terminal:lint :merchant-terminal:assembleRelease artifacts: paths: @@ -11,6 +13,7 @@ merchant_test: merchant_deploy_nightly: stage: deploy + resource_group: deploy_nightly only: refs: - master diff --git a/wallet/.gitlab-ci.yml b/wallet/.gitlab-ci.yml index acd4a49..477acca 100644 --- a/wallet/.gitlab-ci.yml +++ b/wallet/.gitlab-ci.yml @@ -1,7 +1,4 @@ .binary_deps: - only: - changes: - - wallet/**/* before_script: - wget "https://git.taler.net/wallet-android.git/plain/akono.aar?h=binary-deps" -O akono/akono.aar - mkdir -p app/src/main/assets @@ -10,6 +7,11 @@ wallet_test: stage: test extends: .binary_deps + only: + changes: + - wallet/**/* + - taler-kotlin-common/**/* + - build.gradle script: ./gradlew :wallet:lint :wallet:assembleRelease artifacts: paths: @@ -18,8 +20,11 @@ wallet_test: wallet_deploy_nightly: stage: deploy + resource_group: deploy_nightly extends: .binary_deps only: + changes: + - wallet/**/* refs: - master needs: ["wallet_test"] -- cgit v1.2.3