status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
14,481 Commits 445 Branches 179 Tags 481 MiB
Commit Graph

21 Commits

Author SHA1 Message Date
Daniel Nephin 374072d1ee Merge pull request #10527 from hashicorp/rename-main-branch 
Update references to the main branch

 Conflicts:
	.github/CONTRIBUTING.md
	website/content/docs/upgrading/instructions/upgrade-to-1-10-x.mdx

The website conflicts seems like it some of the changes on main didn't
make it into the 1.10.x branch, but the content is relevant for 1.10 so
I took the changes from main.
 2021-06-30 17:58:22 -04:00
Daniel Nephin 48306a1cc2 Merge pull request #10167 from hashicorp/dnephin/ci-cherry-pick-on-release-branch 
ci: allow cherry-picking a manual backport to other release branches
 2021-05-04 17:51:05 +00:00
Matt Keeler d0495902c4
[Backport/1.10.x]: Backport #10073 (#10102) 
* Merge pull request #10094 from hashicorp/update-fingerprint

updating fingerprint

* Add replication metrics (#10073)

Co-authored-by: Daniel Nephin <dnephin@hashicorp.com>
 2021-04-23 16:16:37 -04:00
Alvin Huang e889f7dbcd
ci: fail cherrypick if git push fails (#9673) 2021-01-29 19:42:14 -05:00
Alvin Huang 6cb0482db6
ci: reset working directory between cherrypick labels (#9656) 2021-01-27 15:51:12 -05:00
Mike Morris 81f8f3cace
ci: reword cherry-picker comment (#9192) 2020-11-13 17:14:47 -05:00
Daniel Nephin acfc22822c ci: cherry-pick port-merge comment 2020-11-06 18:06:52 -05:00
Alvin Huang e918da9c40
fix command in cherry-picker script (#8738) 2020-09-23 09:59:17 -04:00
Alvin Huang 958d12907c
cherrypick docs to latest release branch (#8719) 2020-09-21 17:31:21 -04:00
Alvin Huang 2a95289f56
remove set -e for cherry-pick script since we collect errors (#8177) 2020-06-23 18:37:20 -04:00
Alvin Huang 158361fb35
Add GitHub Notifications for cherry picks (#8115) 
* add github PR notification for backport cherry picks

* count number of backport failures and exit after looping through all of them
 2020-06-16 14:18:53 -04:00
Alvin Huang 38da343790
re-enable auto cherry-picking after website launch (#7897) 
* re-enable auto cherry-picking after website launch

* change to regex since we renamed docs-cherrypick to type/docs-cherrypick
 2020-05-14 16:53:51 -04:00
Alvin Huang 30acb31035
disable stable-website auto cherry-pick until replatform is merged into stable-website (#7726) 2020-04-28 17:01:51 -04:00
Alvin Huang 170b2ab8ee
add ssh package and push to branch before notifying (#7517) 2020-03-26 15:23:31 -04:00
Daniel Nephin b298249a14 ci: Move shebang to first line of cherry pick script 
Also ran shellcheck against the script and fixed the other errors
 2020-03-25 11:57:56 -04:00
Daniel Nephin 887e410cd6 ci: support cherry-picking of merge PRs 
This change assumes that it is always safe to use the first commit
parent as the mainline. I believe this assumption is safe with a
github merge workflow.
 2020-03-18 12:38:04 -04:00
Alvin Huang 062823b09a
cherry pick 'docs-cherrypick' label rather than 'docs' to stable-website (#7443) 2020-03-12 13:22:51 -04:00
Alvin Huang 8fbd812be9
add Authorization header in GitHub API call (#7436) 2020-03-11 13:25:15 -04:00
Alvin Huang 0dd8c44291
set pr_url outside if (#7424) 2020-03-10 12:31:58 -04:00
Alvin Huang cb6291a868
add slack notifications for cherry-pick (#7423) 2020-03-10 11:47:23 -04:00
Alvin Huang 45bbb6e035
add auto cherry-picking (#7406) 
* add auto cherry-picking

* exit on git cherry-pick failure

* release branches are #.#.x
 2020-03-06 17:59:14 -05:00