From c60affa78563c5284964d61635c4becc4485cda1 Mon Sep 17 00:00:00 2001 From: metworkbot Date: Mon, 20 Jul 2020 16:02:19 +0000 Subject: [PATCH 1/3] chore: sync common files from resources repository --- .mergify.yml | 148 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 123 insertions(+), 25 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 1a2fd3c..1ada140 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,29 +2,127 @@ pull_request_rules: -- name: master branch - actions: - merge: - method: merge - strict: true - delete_head_branch: {} - conditions: - - base=master - - -merged - - -closed - - label!=Merge Manual - - status-success=continuous-integration/drone/pr - - '#approved-reviews-by>=1' -- name: master branch forced - actions: - merge: - method: merge - strict: true - delete_head_branch: {} - conditions: - - base=master - - -merged - - -closed - - label!=Merge Manual - - label=Merge Now + - name: approved merges + actions: + merge: + method: squash + strict: true + commit_message: title+body + delete_head_branch: {} + conditions: + - -merged + - -closed + - "#approved-reviews-by>=1" + - -title~=(WIP|wip) + - "label!=Status: Blocked" + + - "label~=^Type: " + + + + - name: missing type + actions: + comment: + message: | + To (auto) merge this pull-request, just tag this PR with a label: + + - `Type: Enhancement` (new feature) + - (or) `Type: Bug` (bugfix) + - (or) `Type: Maintenance` (not on the changelog) + conditions: + + - -merged + - -closed + - "#approved-reviews-by>=1" + - -title~=(WIP|wip) + - "label!=Status: Blocked" + - "-label~=^Type: " + + - name: buildbot auto merges + actions: + label: + add: ["Type: Maintenance"] + remove: ["Type: Question", "Type: Enhancement", "Type: Bug"] + review: + type: APPROVE + message: "automatic approve because author=metworkbot" + conditions: + + - -merged + - -closed + - author=metworkbot + - -title~=(WIP|wip) + - "label!=Status: Blocked" + - name: mergenow auto merges + actions: + review: + type: APPROVE + message: "automatic approve because label=Status: Merge Now" + conditions: + + - -merged + - -closed + - -title~=(WIP|wip) + - "label=Status: Merge Now" + - name: wip + actions: + label: + add: ["Status: In Progress"] + remove: ["Status: Revision Needed", "Status: Pending", "Status: Review Needed", "Status: Accepted", "Status: Blocked", "Status: NotReproduced", "Status: Merged", "Status: Merge Now"] + conditions: + + - -merged + - -closed + - title~=(WIP|wip) + - "label!=Status: Blocked" + - name: review needed + actions: + label: + add: ["Status: Review Needed"] + remove: ["Status: Revision Needed", "Status: Pending", "Status: In Progress", "Status: Accepted", "Status: Blocked", "Status: NotReproduced", "Status: Merged", "Status: Merge Now"] + conditions: + + - -merged + - -closed + - -title~=(WIP|wip) + - "label!=Status: Blocked" + - "#approved-reviews-by=0" + - name: revision needed1 + actions: + label: + add: ["Status: Revision Needed"] + remove: ["Status: In Progress", "Status: Pending", "Status: Review Needed", "Status: Accepted", "Status: Blocked", "Status: NotReproduced", "Status: Merged", "Status: Merge Now"] + conditions: + + - -merged + - -closed + - "#changes-requested-reviews-by>=1" + - "label!=Status: Blocked" + - name: revision needed2 + actions: + label: + add: ["Status: Revision Needed"] + remove: ["Status: In Progress", "Status: Pending", "Status: Review Needed", "Status: Accepted", "Status: Blocked", "Status: NotReproduced", "Status: Merged", "Status: Merge Now"] + conditions: + + - -merged + - -closed + - conflict + - "label!=Status: Blocked" + + - name: closed + actions: + label: + add: ["Status: Closed"] + remove: ["Status: Revision Needed", "Status: Pending", "Status: Merged", "Status: Review Needed", "Status: Accepted", "Status: Blocked", "Status: In Progress", "Status: NotReproduced", "Status: Merge Now"] + conditions: + - closed + - -merged + - name: merged + actions: + label: + add: ["Status: Merged"] + remove: ["Status: Revision Needed", "Status: Pending", "Status: Closed", "Status: Review Needed", "Status: Accepted", "Status: Blocked", "Status: In Progress", "Status: NotReproduced", "Status: Merge Now"] + conditions: + - merged From 073ed0ae5998dda8c33f0e9bf8694bf39bac0075 Mon Sep 17 00:00:00 2001 From: metworkbot Date: Tue, 21 Jul 2020 17:39:07 +0000 Subject: [PATCH 2/3] chore: sync common files from resources repository --- .mergify.yml | 24 +++++++++++------------- README.md | 2 ++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 1ada140..bd869f9 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -16,20 +16,21 @@ pull_request_rules: - "#approved-reviews-by>=1" - -title~=(WIP|wip) - "label!=Status: Blocked" + - "title~=^(build|chore|ci|docs|style|refactor|perf|test|fix|feat|fix|feat|feat!|fix!)(\\([a-z]+\\))?: [\\w ]+$" - - "label~=^Type: " - - - - - name: missing type + - name: change title actions: comment: message: | - To (auto) merge this pull-request, just tag this PR with a label: + For mergify to merge automatically this PR, - - `Type: Enhancement` (new feature) - - (or) `Type: Bug` (bugfix) - - (or) `Type: Maintenance` (not on the changelog) + => you have to change the PR title to match conventional commit specification: + + ``` + regex: ^(build|chore|ci|docs|style|refactor|perf|test|fix|feat|fix|feat|feat!|fix!)(\([a-z]+\))?: [\w ]+$ + ``` + + As the title will be used for the commit message (and so for changelog entry if `feat:` or `fix:`). conditions: - -merged @@ -37,13 +38,10 @@ pull_request_rules: - "#approved-reviews-by>=1" - -title~=(WIP|wip) - "label!=Status: Blocked" - - "-label~=^Type: " + - "-title~=^(build|chore|ci|docs|style|refactor|perf|test|fix|feat|fix|feat|feat!|fix!)(\\([a-z]+\\))?: [\\w ]+$" - name: buildbot auto merges actions: - label: - add: ["Type: Maintenance"] - remove: ["Type: Question", "Type: Enhancement", "Type: Bug"] review: type: APPROVE message: "automatic approve because author=metworkbot" diff --git a/README.md b/README.md index 8987a9e..9d0c865 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ [//]: # (TABLE_OF_CONTENTS_PLACEHOLDER) + + ## What is it? **log_proxy** is a tiny C utility for log rotation for apps that write their logs to stdout. From 95a4f25292a145cda7a8696cf646c0a8f468f279 Mon Sep 17 00:00:00 2001 From: metworkbot Date: Wed, 22 Jul 2020 02:20:22 +0000 Subject: [PATCH 3/3] chore: CHANGELOG update --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cf49ae..7790399 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,43 @@ # CHANGELOG +## [Unreleased] + +### New Features +- add fifo-tmp-dir option to log_proxy_wrapper + + + + + + +## v0.2.3 (2020-07-10) + +- No interesting change + + +## v0.2.2 (2020-07-10) + +- No interesting change + + +## v0.2.1 (2020-07-10) + +- No interesting change + + +## v0.2.0 (2020-07-10) + +### New Features +- add option for static compiling +- releases are now static builds +- add install script +- add install script + + + + + ## v0.1.1 (2020-05-04)