diff options
| author | Oliver Poignant <oliver@poignant.se> | 2016-11-29 21:15:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 21:15:03 +0100 |
| commit | a4d94b4acf1ef43de3b452e78e0208fd7222a01b (patch) | |
| tree | f589b5cd57db2b1fe1702fd5039dd07032ef6db3 | |
| parent | 749ce13ae6e9cecf69997d36228f2cab9a2eb8ec (diff) | |
| parent | 482781f0ffabf3ff77f8b30e73bec8103251ad86 (diff) | |
| download | Git-Auto-Deploy-a4d94b4acf1ef43de3b452e78e0208fd7222a01b.zip Git-Auto-Deploy-a4d94b4acf1ef43de3b452e78e0208fd7222a01b.tar.gz Git-Auto-Deploy-a4d94b4acf1ef43de3b452e78e0208fd7222a01b.tar.bz2 | |
Merge pull request #152 from olipo186/hwhesselink-multiple_gh_repos
Hwhesselink multiple gh repos
| -rw-r--r-- | docs/Configuration.md | 1 | ||||
| -rw-r--r-- | gitautodeploy/parsers/common.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/Configuration.md b/docs/Configuration.md index c7248ca..24ce2ac 100644 --- a/docs/Configuration.md +++ b/docs/Configuration.md @@ -37,6 +37,7 @@ as follow: Repository configurations are comprised of the following elements: - **url**: The URL to the repository. + - **match-url**: An alternative URL used when matching incoming webhook requests (see https://github.com/olipo186/Git-Auto-Deploy/pull/148) - **branch**: The branch which will be checked out. - **remote**: The name of the remote to use. - **path**: Path to clone the repository to. If omitted, the repository won't diff --git a/gitautodeploy/parsers/common.py b/gitautodeploy/parsers/common.py index 42cbbdd..0a1a799 100644 --- a/gitautodeploy/parsers/common.py +++ b/gitautodeploy/parsers/common.py @@ -16,9 +16,9 @@ class WebhookRequestParser(object): for repo_config in self._config['repositories']: if repo_config in configs: continue - if repo_config['url'] == url: + if repo_config.get('match-url', repo_config.get('url')) == url: configs.append(repo_config) elif 'url_without_usernme' in repo_config and repo_config['url_without_usernme'] == url: configs.append(repo_config) - return configs
\ No newline at end of file + return configs |