From 562b0e644a43e036bb557f69df18add528194d28 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Mon, 1 Feb 2021 22:20:03 +0100 Subject: [PATCH] updated .drone.yml and renovate.json --- .drone.yml | 10 +++------- renovate.json | 3 ++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index e2c0cbd..1cdc385 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,17 +2,13 @@ kind: pipeline type: docker name: default -platform: - os: linux - arch: arm - steps: - name: build image: node commands: - npm install - npm run build - - name: deploy-develop + - name: deploy-dev image: alpine environment: FTP_HOST: @@ -29,7 +25,7 @@ steps: - develop event: - push - - name: deploy-master + - name: deploy image: alpine environment: FTP_HOST: @@ -43,6 +39,6 @@ steps: - lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ samuel-philipp.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST when: branch: - - master + - main event: - push diff --git a/renovate.json b/renovate.json index 3b73487..8fba284 100644 --- a/renovate.json +++ b/renovate.json @@ -5,5 +5,6 @@ "baseBranches": [ "develop" ], - "rangeStrategy": "bump" + "rangeStrategy": "bump", + "rebaseWhen": "behind-base-branch" }