diff --git a/.drone.yml b/.drone.yml index 9c3d877..a770f10 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,13 +2,17 @@ kind: pipeline type: docker name: default +platform: + os: linux + arch: arm + steps: - name: build image: node commands: - npm install - npm run build - - name: deploy-dev + - name: deploy-develop image: alpine environment: FTP_HOST: @@ -25,7 +29,7 @@ steps: - develop event: - push - - name: deploy + - name: deploy-master image: alpine environment: FTP_HOST: @@ -39,6 +43,6 @@ steps: - lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST when: branch: - - main + - master event: - push diff --git a/renovate.json b/renovate.json index 8fba284..3b73487 100644 --- a/renovate.json +++ b/renovate.json @@ -5,6 +5,5 @@ "baseBranches": [ "develop" ], - "rangeStrategy": "bump", - "rebaseWhen": "behind-base-branch" + "rangeStrategy": "bump" }