Merge branch 'master' of github.com:metwork-framework/log_proxy

metwork-framework · Jul 27, 2020 · 6cdf70d · 6cdf70d
2 parents 7704b22 + 95a4f25
commit 6cdf70d
Show file tree

Hide file tree

Showing 3 changed files with 160 additions and 25 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -2,29 +2,125 @@
 
 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"
+      - "title~=^(build|chore|ci|docs|style|refactor|perf|test|fix|feat|fix|feat|feat!|fix!)(\\([a-z]+\\))?: [\\w ]+$"
+
+  - name: change title
+    actions:
+      comment:
+        message: |
+          For mergify to merge automatically this PR,
+
+          => 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
+      - -closed
+      - "#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 ]+$"
+
+  - name: buildbot auto merges
+    actions:
+      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
diff --git 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)
 

diff --git 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.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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.
Expand Down