automaticly merge main into dev after building a latest image
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
618430433d
commit
02efb9a8e5
20
.drone.yml
20
.drone.yml
@ -90,11 +90,20 @@ trigger:
|
|||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
name: build:latest
|
name: build:latest
|
||||||
|
clone:
|
||||||
|
disable: true
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: clone
|
||||||
|
image: alpine/git
|
||||||
|
commands:
|
||||||
|
- git clone $DRONE_REMOTE_URL .
|
||||||
|
- git checkout dev
|
||||||
|
- git merge main
|
||||||
|
- git checkout main
|
||||||
- name: build latest
|
- name: build latest
|
||||||
|
depends_on: ["clone"]
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
depends_on: [clone]
|
|
||||||
settings:
|
settings:
|
||||||
username:
|
username:
|
||||||
from_secret: DOCKER_REGISTRY_USER
|
from_secret: DOCKER_REGISTRY_USER
|
||||||
@ -104,6 +113,15 @@ steps:
|
|||||||
tags:
|
tags:
|
||||||
- latest
|
- latest
|
||||||
registry: registry.odit.services
|
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:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user