Merge tag 'v1.6.14' into merge/1.5.19

velas · Jul 8, 2021 · 47cfcaa · 47cfcaa
2 parents 61e25e4 + 7759210
commit 47cfcaa
Show file tree

Hide file tree

Showing 558 changed files with 40,985 additions and 19,916 deletions.
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
@@ -36,4 +36,7 @@ export CARGO_TARGET_CACHE=$HOME/cargo-target-cache/"$CHANNEL"-"$BUILDKITE_LABEL"
   # `std:
   #    "found possibly newer version of crate `std` which `xyz` depends on
   rm -rf target/bpfel-unknown-unknown
+  if [[ $BUILDKITE_LABEL = "stable-perf" ]]; then
+    rm -rf target/release
+  fi
 )
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@
 *.log
 log-*.txt
 log-*/
+!log-analyzer
 
 # intellij files
 /.idea/

diff --git a/.mergify.yml b/.mergify.yml
@@ -50,14 +50,6 @@ pull_request_rules:
       label:
         add:
           - automerge
-  - name: v1.3 backport
-    conditions:
-      - label=v1.3
-    actions:
-      backport:
-        ignore_conflicts: true
-        branches:
-          - v1.3
   - name: v1.4 backport
     conditions:
       - label=v1.4
@@ -82,3 +74,11 @@ pull_request_rules:
         ignore_conflicts: true
         branches:
           - v1.6
+  - name: v1.7 backport
+    conditions:
+      - label=v1.7
+    actions:
+      backport:
+        ignore_conflicts: true
+        branches:
+          - v1.7
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ @@
     *.log
     log-*.txt
     log-*/
+    !log-analyzer
     # intellij files
     /.idea/
@@ Expand Down @@