the most dreaded part of my week. clench+merge day (release)

i3roly · Jun 14, 2024 · 13db70e · 13db70e
2 parents 6c3c985 + 399e7d4
commit 13db70e
Show file tree

Hide file tree

Showing 13 changed files with 520 additions and 281 deletions.
diff --git a/.hgtags b/.hgtags
@@ -5001,3 +5001,5 @@ ce0a7991665d307fb2464a111b59938357e4671f FIREFOX_RELEASE_126_END
 81170fe36cb2562215e1bb410166e76be7b24206 FIREFOX_127_0_BUILD1
 81170fe36cb2562215e1bb410166e76be7b24206 FIREFOX-ANDROID_127_0_BUILD1
 cfd3e02d8411b3a938cda7242dcf044cf03c03d1 FIREFOX_127_0_BUILD2
+cfd3e02d8411b3a938cda7242dcf044cf03c03d1 FIREFOX_127_0_RELEASE
+81170fe36cb2562215e1bb410166e76be7b24206 FIREFOX-ANDROID_127_0_RELEASE
diff --git a/browser/config/version.txt b/browser/config/version.txt
@@ -1 +1 @@
-127.0
+127.0.1
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
@@ -1 +1 @@
-127.0
+127.0.1
diff --git a/config/milestone.txt b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-127.0
+127.0.1
diff --git a/dom/canvas/test/webgl-mochitest/test_renderer_strings.html b/dom/canvas/test/webgl-mochitest/test_renderer_strings.html
@@ -58,6 +58,7 @@
       'llvmpipe', // Linux
       'Intel(R) HD Graphics 400', // Mac
       'Apple M1', // Mac
+      'Apple M2', // Mac
       'ANGLE (NVIDIA, NVIDIA GeForce 8800 GTX Direct3D11 vs_5_0 ps_5_0)', // Windows
     ].map(x => x + ', or similar'),
     vendor: [
@@ -69,8 +70,10 @@
       'llvmpipe (LLVM 10.0.0, 256 bits)', // Linux
       'Intel(R) UHD Graphics 630', // Mac
       'Apple M1', // Mac
+      'Apple M2', // Mac
       'ANGLE (NVIDIA, NVIDIA Tesla M60 Direct3D11 vs_5_0 ps_5_0, D3D11-23.21.13.9181)', // Windows
       'ANGLE (NVIDIA, NVIDIA Tesla M60 Direct3D11 vs_5_0 ps_5_0, D3D11-30.0.14.7239)', // Windows 11
+      'ANGLE (NVIDIA, NVIDIA Tesla M60 Direct3D11 vs_5_0 ps_5_0, D3D11-31.0.15.3815)', //Windows 11
     ],
     unmasked_vendor: [
       'Qualcomm', // Android

diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build
@@ -93,6 +93,8 @@ elif CONFIG['TARGET_CPU'] == 'arm':
             'pixman-arm-simd-asm.S',
             'pixman-arm-simd.c',
         ]
+    if CONFIG['HAVE_ARM_NEON'] or CONFIG['HAVE_ARM_SIMD']:
+        DEFINES['ASM_HAVE_SYNTAX_UNIFIED'] = True
     if CONFIG['OS_TARGET'] == 'Android':
         # For cpu-features.h
         LOCAL_INCLUDES += [

diff --git a/image/test/reftest/generic/reftest.list b/image/test/reftest/generic/reftest.list
@@ -3,5 +3,5 @@ skip-if(Android) != moz-icon-1.html about:blank
 == moz-icon-blank-1.html moz-icon-blank-1-ref.html
 skip-if(Android) != moz-icon-blank-1-ref.html moz-icon-blank-1-antiref.html
 skip-if(Android) != moz-icon-blank-1-ref.html moz-icon-blank-1-antiref2.html
-fuzzy-if(cocoaWidget,44-49,335-348) fuzzy-if(winWidget,64-140,45-191) == moz-icon-blank-1-almostref.html moz-icon-blank-1-ref.html
+fuzzy-if(cocoaWidget,44-49,335-348) fuzzy-if(winWidget,64-141,45-191) == moz-icon-blank-1-almostref.html moz-icon-blank-1-ref.html
 pref(image.testing.decode-sync.enabled,false) == 1805599-1.html 1805599-1-ref.html
diff --git a/mobile/android/version.txt b/mobile/android/version.txt
@@ -1 +1 @@
-127.0
+127.0.1
diff --git a/services/settings/dumps/blocklists/addons-bloomfilters.json b/services/settings/dumps/blocklists/addons-bloomfilters.json
@@ -1,5 +1,18 @@
 {
   "data": [
+    {
+      "stash": {
+        "blocked": [
+          "{80f72148-c2c1-4690-b9bb-eb49b7e35aad}:1.2"
+        ],
+        "unblocked": []
+      },
+      "schema": 1718040172384,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1718109305604,
+      "id": "5efe9fe9-e815-4eaa-8b3e-399a3c4e27eb",
+      "last_modified": 1718109362020
+    },
     {
       "stash": {
         "blocked": [
@@ -707,5 +720,5 @@
       "last_modified": 1707395854769
     }
   ],
-  "timestamp": 1717094162111
+  "timestamp": 1718109362020
 }
diff --git a/services/settings/dumps/main/devtools-compatibility-browsers.json b/services/settings/dumps/main/devtools-compatibility-browsers.json
@@ -1,5 +1,59 @@
 {
   "data": [
+    {
+      "name": "Chrome",
+      "schema": 1717054811711,
+      "status": "nightly",
+      "version": "127",
+      "browserid": "chrome",
+      "id": "0e69f9d7-19f6-4c6e-bc36-731da4cee6e3",
+      "last_modified": 1718005312990
+    },
+    {
+      "name": "Edge",
+      "schema": 1717286706296,
+      "status": "planned",
+      "version": "128",
+      "browserid": "edge",
+      "id": "edad0482-a612-4019-a601-53dc349514b8",
+      "last_modified": 1718005312987
+    },
+    {
+      "name": "Node.js",
+      "schema": 1717286706438,
+      "status": "esr",
+      "version": "20.12.0",
+      "browserid": "nodejs",
+      "id": "93175823-df25-4102-bda0-e45955132cb5",
+      "last_modified": 1718005312984
+    },
+    {
+      "name": "Deno",
+      "schema": 1717805106873,
+      "status": "current",
+      "version": "1.44",
+      "browserid": "deno",
+      "id": "ea6c817d-237b-498b-964e-a8ca4668580a",
+      "last_modified": 1718005312981
+    },
+    {
+      "name": "Edge",
+      "schema": 1717286706151,
+      "status": "beta",
+      "version": "126",
+      "browserid": "edge",
+      "id": "c8bf4918-03b7-4be2-bf75-4d6139dbd7c9",
+      "last_modified": 1718005312974
+    },
+    {
+      "name": "Edge",
+      "schema": 1717286706227,
+      "status": "nightly",
+      "version": "127",
+      "browserid": "edge",
+      "id": "9e227c6c-b6ca-4c69-868c-e133a0ee9dbd",
+      "last_modified": 1718005312971
+    },
     {
       "name": "Edge",
       "schema": 1716941107417,
@@ -180,24 +234,6 @@
       "id": "98f20ad9-f47a-476b-b376-be58dbcc76ff",
       "last_modified": 1715589742227
     },
-    {
-      "name": "Edge",
-      "schema": 1714867506498,
-      "status": "planned",
-      "version": "127",
-      "browserid": "edge",
-      "id": "9e227c6c-b6ca-4c69-868c-e133a0ee9dbd",
-      "last_modified": 1715003394961
-    },
-    {
-      "name": "Edge",
-      "schema": 1714867506401,
-      "status": "nightly",
-      "version": "126",
-      "browserid": "edge",
-      "id": "c8bf4918-03b7-4be2-bf75-4d6139dbd7c9",
-      "last_modified": 1715003394956
-    },
     {
       "name": "Samsung Internet",
       "schema": 1714521906708,
@@ -225,24 +261,6 @@
       "id": "08a3849f-52fd-40ae-9054-b0e33272d279",
       "last_modified": 1713943930228
     },
-    {
-      "name": "Deno",
-      "schema": 1712707507752,
-      "status": "current",
-      "version": "1.42",
-      "browserid": "deno",
-      "id": "a308f3c2-cc19-4a1e-825f-898696606328",
-      "last_modified": 1712840749681
-    },
-    {
-      "name": "Node.js",
-      "schema": 1702685107693,
-      "status": "esr",
-      "version": "20.10.0",
-      "browserid": "nodejs",
-      "id": "0d78585f-e9e0-41e8-816a-22461158e36d",
-      "last_modified": 1702890886929
-    },
     {
       "name": "Firefox for Android",
       "schema": 1698797104411,
@@ -280,5 +298,5 @@
       "last_modified": 1665656484764
     }
   ],
-  "timestamp": 1716966331504
+  "timestamp": 1718005312990
 }