Merge branch 'main' into docker-user

oxsecurity · Oct 22, 2022 · 0b0060f · 0b0060f
2 parents e027668 + a67b29e
commit 0b0060f
Show file tree

Hide file tree

Showing 148 changed files with 1,978 additions and 959 deletions.
diff --git a/.automation/build.py b/.automation/build.py
@@ -520,6 +520,7 @@ def match_flavor(item, flavor, flavor_info):
         if flavor in item["descriptor_flavors"] or (
             "all_flavors" in item["descriptor_flavors"]
             and not flavor.endswith("_light")
+            and "cupcake" not in flavor
             and not is_strict
         ):
             return True

diff --git a/.automation/generated/flavors-stats.json b/.automation/generated/flavors-stats.json
@@ -1019,6 +1019,10 @@
         [
             "2022-10-18T06:25:58",
             2626933
+        ],
+        [
+            "2022-10-22T11:41:20",
+            2633257
         ]
     ],
     "ci_light": [
@@ -2041,6 +2045,16 @@
         [
             "2022-10-18T06:25:58",
             28838
+        ],
+        [
+            "2022-10-22T11:41:20",
+            29341
+        ]
+    ],
+    "cupcake": [
+        [
+            "2022-10-22T11:41:20",
+            1
         ]
     ],
     "dart": [
@@ -3973,6 +3987,10 @@
         [
             "2022-10-18T06:25:58",
             78557
+        ],
+        [
+            "2022-10-22T11:41:20",
+            79788
         ]
     ],
     "dotnet": [
@@ -4995,6 +5013,10 @@
         [
             "2022-10-18T06:25:58",
             316688
+        ],
+        [
+            "2022-10-22T11:41:20",
+            317453
         ]
     ],
     "go": [
@@ -6017,6 +6039,10 @@
         [
             "2022-10-18T06:25:58",
             14338
+        ],
+        [
+            "2022-10-22T11:41:20",
+            14450
         ]
     ],
     "java": [
@@ -7039,6 +7065,10 @@
         [
             "2022-10-18T06:25:58",
             96074
+        ],
+        [
+            "2022-10-22T11:41:20",
+            96615
         ]
     ],
     "javascript": [
@@ -8061,6 +8091,10 @@
         [
             "2022-10-18T06:25:58",
             157500
+        ],
+        [
+            "2022-10-22T11:41:20",
+            158708
         ]
     ],
     "php": [
@@ -9083,6 +9117,10 @@
         [
             "2022-10-18T06:25:58",
             23473
+        ],
+        [
+            "2022-10-22T11:41:20",
+            24408
         ]
     ],
     "python": [
@@ -10105,6 +10143,10 @@
         [
             "2022-10-18T06:25:58",
             112995
+        ],
+        [
+            "2022-10-22T11:41:20",
+            114727
         ]
     ],
     "ruby": [
@@ -11123,6 +11165,10 @@
         [
             "2022-10-18T06:25:58",
             2661
+        ],
+        [
+            "2022-10-22T11:41:20",
+            2667
         ]
     ],
     "rust": [
@@ -12141,6 +12187,10 @@
         [
             "2022-10-18T06:25:58",
             4035
+        ],
+        [
+            "2022-10-22T11:41:20",
+            4073
         ]
     ],
     "salesforce": [
@@ -13163,6 +13213,10 @@
         [
             "2022-10-18T06:25:58",
             14494
+        ],
+        [
+            "2022-10-22T11:41:20",
+            14625
         ]
     ],
     "scala": [
@@ -14183,6 +14237,10 @@
         [
             "2022-10-18T06:25:58",
             1341
+        ],
+        [
+            "2022-10-22T11:41:20",
+            1343
         ]
     ],
     "swift": [
@@ -15201,6 +15259,10 @@
         [
             "2022-10-18T06:25:58",
             2596
+        ],
+        [
+            "2022-10-22T11:41:20",
+            2627
         ]
     ],
     "terraform": [
@@ -16223,6 +16285,10 @@
         [
             "2022-10-18T06:25:58",
             122680
+        ],
+        [
+            "2022-10-22T11:41:20",
+            124743
         ]
     ]
 }