diff --git a/.drone.yml b/.drone.yml index ec2c8fd..204f6c3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -90,11 +90,20 @@ trigger: kind: pipeline type: docker name: build:latest +clone: + disable: true steps: + - name: clone + image: alpine/git + commands: + - git clone $DRONE_REMOTE_URL . + - git checkout dev + - git merge main + - git checkout main - name: build latest + depends_on: ["clone"] image: plugins/docker - depends_on: [clone] settings: username: from_secret: DOCKER_REGISTRY_USER @@ -104,6 +113,15 @@ steps: tags: - latest registry: registry.odit.services + - name: push merge to repo + depends_on: ["clone"] + image: appleboy/drone-git-push + settings: + branch: dev + commit: false + remote: git@git.odit.services:lfk/backend.git + ssh_key: + from_secret: GITLAB_SSHKEY trigger: branch: