-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
{CI} Auto merge release pull reqeust create by azclibot #4950
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
#!/usr/bin/env python | ||
|
||
# -------------------------------------------------------------------------------------------- | ||
# Copyright (c) Microsoft Corporation. All rights reserved. | ||
# Licensed under the MIT License. See License.txt in the project root for license information. | ||
# -------------------------------------------------------------------------------------------- | ||
|
||
import json | ||
import logging | ||
import requests | ||
import shlex | ||
import subprocess | ||
import sys | ||
|
||
logger = logging.getLogger(__name__) | ||
logger.setLevel(logging.DEBUG) | ||
ch = logging.StreamHandler() | ||
ch.setLevel(logging.DEBUG) | ||
logger.addHandler(ch) | ||
|
||
|
||
def auto_merge(headers, number): | ||
# curl -X PUT https://api.github.com/repos/OWNER/REPO/pulls/PULL_NUMBER/merge | ||
merge_url = f'https://api.github.com/repos/Azure/azure-cli-extensions/pulls/{number}/merge' | ||
logger.debug(merge_url) | ||
# merge_method: merge, squash or rebase | ||
# we use `sqush and merge` button | ||
body = { | ||
'merge_method': 'squash' | ||
} | ||
try: | ||
r = requests.put(merge_url, json=body, headers=headers) | ||
except requests.RequestException as e: | ||
raise e | ||
if r.status_code != 200: | ||
logger.debug(r) | ||
logger.debug(r.text) | ||
sys.exit(1) | ||
|
||
|
||
def main(): | ||
try: | ||
# get azclibot token | ||
with open('/tmp/token.txt') as f: | ||
token = f.readline().replace("\n", "") | ||
# get create_pr response | ||
with open('/tmp/create_pr.json') as f: | ||
ref = f.read() | ||
except FileNotFoundError: | ||
logger.debug('no PR create, no need to merge PR') | ||
sys.exit(0) | ||
headers = {'Authorization': 'token %s' % token} | ||
# get pr id | ||
number = json.loads(ref)['number'] | ||
auto_merge(headers, number) | ||
|
||
|
||
if __name__ == '__main__': | ||
main() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not fetch token from keyvault?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In old steps, we can use environment variable

Azure subscription
in Azure CLI option.So it is easy to use azure cli command.
And the token.txt is get from the
az keyvault
commmand in last step, and the transfer between the two steps can only use a temporary file.We have used another temporary file upgrade_extensions.txt to identify if there are extensions that need to be upgraded.
But new step I use python script which not support environment variable.

And after the job finished (about 4 mins) this agent will be delete, so I think it is safe.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't we use Arguments?