Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

auto merge pr in drone #4096

Merged
merged 1 commit into from
Sep 18, 2024
Merged

auto merge pr in drone #4096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .drone/drone.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ local deploy_to_dev() = {
config_json: std.manifestJsonEx(
{
destination_branch: 'master',
pull_request_branch_prefix: 'cd-tempo-dev',
pull_request_branch_prefix: 'auto-merge/cd-tempo-dev',
pull_request_enabled: true,
pull_request_existing_strategy: "ignore",
repo_name: 'deployment_tools',
Expand Down
4 changes: 2 additions & 2 deletions .drone/drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ steps:
config_json: |-
{
"destination_branch": "master",
"pull_request_branch_prefix": "cd-tempo-dev",
"pull_request_branch_prefix": "auto-merge/cd-tempo-dev",
"pull_request_enabled": true,
"pull_request_existing_strategy": "ignore",
"repo_name": "deployment_tools",
Expand Down Expand Up @@ -583,6 +583,6 @@ kind: secret
name: gpg_passphrase
---
kind: signature
hmac: fa32f6c72b1b62254ed9b8568d3b9cb202d82f5ac03e96a1b5548b0e3cf11139
hmac: c46c1f75885fe897a2700bfbe648891f18b5b9820aba1d34e4ae8ce6979af5be

...