Bug 1995469 [wpt PR 55566] - tools: update download URL schema for Servo nightly, a=testonly

marco-c · marco-c · commit aa5ffe099869 · 2025-11-01T01:43:00.000Z
Automatic update from web-platform-tests
tools: update download URL schema for Servo nightly

Servo has adopted a new URL schema for its nightly builds that includes
the platform/toolchain names.

Update the corresponding download &amp; install logic in wpt to use this new
schema as the old one will be discontinued soon.

Signed-off-by: Mukilan Thiyagarajan &lt;mukilanigalia.com&gt;

--

wpt-commits: 75fe081bfb9159fe8c3c2a4e474da45677a374b4
wpt-pr: 55566

UltraBlame original commit: e4c22888401a665369c3f57680eafaa074cabb53
diff --git a/testing/web-platform/tests/tools/wpt/browser.py b/testing/web-platform/tests/tools/wpt/browser.py
@@ -19768,41 +19768,118 @@
 :
         
 platform
+triple
 =
 {
             
+(
 "
-Linux
+Darwin
+"
+"
+arm64
 "
+)
 :
+(
+"
+mac
+-
+arm64
 "
-linux
 "
+aarch64
+-
+apple
+-
+darwin
+"
+)
             
+(
 "
-Windows
+Darwin
+"
+"
+x86_64
 "
+)
 :
+(
 "
-win
+mac
 "
+"
+x86_64
+-
+apple
+-
+darwin
+"
+)
             
+(
+"
+Linux
 "
-Darwin
 "
+x86_64
+"
+)
 :
+(
 "
-mac
+linux
+"
+"
+x86_64
+-
+linux
+-
+gnu
+"
+)
+            
+(
 "
+Windows
+"
+"
+AMD64
+"
+)
+:
+(
+"
+win
+"
+"
+x86_64
+-
+windows
+-
+msvc
+"
+)
         
 }
 .
 get
 (
+(
 uname
 [
 0
 ]
+uname
+[
+4
+]
+)
+(
+None
+None
+)
 )
         
 if
@@ -19852,18 +19929,20 @@
         
 elif
 platform
-=
-=
+in
+[
 "
 win
 "
-or
-platform
-=
-=
 "
 mac
 "
+"
+mac
+-
+arm64
+"
+]
 :
             
 raise
@@ -19883,9 +19962,21 @@
 "
 )
         
+default_filename
+=
+f
+"
+servo
+-
+{
+triple
+}
+"
+        
 return
 (
 platform
+default_filename
 extension
 decompress
 )
@@ -19926,6 +20017,7 @@
 )
         
 platform
+filename
 extension
 _
 =
@@ -19935,8 +20027,22 @@
 (
 )
         
-url
+artifact
 =
+f
+"
+{
+filename
+}
+{
+extension
+}
+"
+        
+return
+get
+(
+f
 "
 https
 :
@@ -19950,25 +20056,14 @@
 /
 nightly
 /
-%
-s
+{
+platform
+}
 /
-servo
--
-latest
-%
-s
+{
+artifact
+}
 "
-%
-(
-platform
-extension
-)
-        
-return
-get
-(
-url
 )
     
 def
@@ -20012,6 +20107,7 @@
 )
         
 _
+default_filename
 extension
 _
 =
@@ -20030,11 +20126,7 @@
 not
 None
 else
-"
-servo
--
-latest
-"
+default_filename
         
 with
 open
@@ -20114,6 +20206,7 @@
 .
 pwd
         
+_
 _
 _
 decompress

Original file line number	Diff line number	Diff line change
`@@ -19768,41 +19768,118 @@`
`19768`	`19768`	`:`
`19769`	`19769`
`19770`	`19770`	`platform`
	`19771`	`+triple`
`19771`	`19772`	`=`
`19772`	`19773`	`{`
`19773`	`19774`
	`19775`	`+(`
`19774`	`19776`	`"`
`19775`		`-Linux`
	`19777`	`+Darwin`
	`19778`	`+"`
	`19779`	`+"`
	`19780`	`+arm64`
`19776`	`19781`	`"`
	`19782`	`+)`
`19777`	`19783`	`:`
	`19784`	`+(`
	`19785`	`+"`
	`19786`	`+mac`
	`19787`	`+-`
	`19788`	`+arm64`
`19778`	`19789`	`"`
`19779`		`-linux`
`19780`	`19790`	`"`
	`19791`	`+aarch64`
	`19792`	`+-`
	`19793`	`+apple`
	`19794`	`+-`
	`19795`	`+darwin`
	`19796`	`+"`
	`19797`	`+)`
`19781`	`19798`
	`19799`	`+(`
`19782`	`19800`	`"`
`19783`		`-Windows`
	`19801`	`+Darwin`
	`19802`	`+"`
	`19803`	`+"`
	`19804`	`+x86_64`
`19784`	`19805`	`"`
	`19806`	`+)`
`19785`	`19807`	`:`
	`19808`	`+(`
`19786`	`19809`	`"`
`19787`		`-win`
	`19810`	`+mac`
`19788`	`19811`	`"`
	`19812`	`+"`
	`19813`	`+x86_64`
	`19814`	`+-`
	`19815`	`+apple`
	`19816`	`+-`
	`19817`	`+darwin`
	`19818`	`+"`
	`19819`	`+)`
`19789`	`19820`
	`19821`	`+(`
	`19822`	`+"`
	`19823`	`+Linux`
`19790`	`19824`	`"`
`19791`		`-Darwin`
`19792`	`19825`	`"`
	`19826`	`+x86_64`
	`19827`	`+"`
	`19828`	`+)`
`19793`	`19829`	`:`
	`19830`	`+(`
`19794`	`19831`	`"`
`19795`		`-mac`
	`19832`	`+linux`
	`19833`	`+"`
	`19834`	`+"`
	`19835`	`+x86_64`
	`19836`	`+-`
	`19837`	`+linux`
	`19838`	`+-`
	`19839`	`+gnu`
	`19840`	`+"`
	`19841`	`+)`
	`19842`	`+`
	`19843`	`+(`
`19796`	`19844`	`"`
	`19845`	`+Windows`
	`19846`	`+"`
	`19847`	`+"`
	`19848`	`+AMD64`
	`19849`	`+"`
	`19850`	`+)`
	`19851`	`+:`
	`19852`	`+(`
	`19853`	`+"`
	`19854`	`+win`
	`19855`	`+"`
	`19856`	`+"`
	`19857`	`+x86_64`
	`19858`	`+-`
	`19859`	`+windows`
	`19860`	`+-`
	`19861`	`+msvc`
	`19862`	`+"`
	`19863`	`+)`
`19797`	`19864`
`19798`	`19865`	`}`
`19799`	`19866`	`.`
`19800`	`19867`	`get`
`19801`	`19868`	`(`
	`19869`	`+(`
`19802`	`19870`	`uname`
`19803`	`19871`	`[`
`19804`	`19872`	`0`
`19805`	`19873`	`]`
	`19874`	`+uname`
	`19875`	`+[`
	`19876`	`+4`
	`19877`	`+]`
	`19878`	`+)`
	`19879`	`+(`
	`19880`	`+None`
	`19881`	`+None`
	`19882`	`+)`
`19806`	`19883`	`)`
`19807`	`19884`
`19808`	`19885`	`if`
`@@ -19852,18 +19929,20 @@`
`19852`	`19929`
`19853`	`19930`	`elif`
`19854`	`19931`	`platform`
`19855`		`-=`
`19856`		`-=`
	`19932`	`+in`
	`19933`	`+[`
`19857`	`19934`	`"`
`19858`	`19935`	`win`
`19859`	`19936`	`"`
`19860`		`-or`
`19861`		`-platform`
`19862`		`-=`
`19863`		`-=`
`19864`	`19937`	`"`
`19865`	`19938`	`mac`
`19866`	`19939`	`"`
	`19940`	`+"`
	`19941`	`+mac`
	`19942`	`+-`
	`19943`	`+arm64`
	`19944`	`+"`
	`19945`	`+]`
`19867`	`19946`	`:`
`19868`	`19947`
`19869`	`19948`	`raise`
`@@ -19883,9 +19962,21 @@`
`19883`	`19962`	`"`
`19884`	`19963`	`)`
`19885`	`19964`
	`19965`	`+default_filename`
	`19966`	`+=`
	`19967`	`+f`
	`19968`	`+"`
	`19969`	`+servo`
	`19970`	`+-`
	`19971`	`+{`
	`19972`	`+triple`
	`19973`	`+}`
	`19974`	`+"`
	`19975`	`+`
`19886`	`19976`	`return`
`19887`	`19977`	`(`
`19888`	`19978`	`platform`
	`19979`	`+default_filename`
`19889`	`19980`	`extension`
`19890`	`19981`	`decompress`
`19891`	`19982`	`)`
`@@ -19926,6 +20017,7 @@`
`19926`	`20017`	`)`
`19927`	`20018`
`19928`	`20019`	`platform`
	`20020`	`+filename`
`19929`	`20021`	`extension`
`19930`	`20022`	`_`
`19931`	`20023`	`=`
`@@ -19935,8 +20027,22 @@`
`19935`	`20027`	`(`
`19936`	`20028`	`)`
`19937`	`20029`
`19938`		`-url`
	`20030`	`+artifact`
`19939`	`20031`	`=`
	`20032`	`+f`
	`20033`	`+"`
	`20034`	`+{`
	`20035`	`+filename`
	`20036`	`+}`
	`20037`	`+{`
	`20038`	`+extension`
	`20039`	`+}`
	`20040`	`+"`
	`20041`	`+`
	`20042`	`+return`
	`20043`	`+get`
	`20044`	`+(`
	`20045`	`+f`
`19940`	`20046`	`"`
`19941`	`20047`	`https`
`19942`	`20048`	`:`
`@@ -19950,25 +20056,14 @@`
`19950`	`20056`	`/`
`19951`	`20057`	`nightly`
`19952`	`20058`	`/`
`19953`		`-%`
`19954`		`-s`
	`20059`	`+{`
	`20060`	`+platform`
	`20061`	`+}`
`19955`	`20062`	`/`
`19956`		`-servo`
`19957`		`--`
`19958`		`-latest`
`19959`		`-%`
`19960`		`-s`
	`20063`	`+{`
	`20064`	`+artifact`
	`20065`	`+}`
`19961`	`20066`	`"`
`19962`		`-%`
`19963`		`-(`
`19964`		`-platform`
`19965`		`-extension`
`19966`		`-)`
`19967`		`-`
`19968`		`-return`
`19969`		`-get`
`19970`		`-(`
`19971`		`-url`
`19972`	`20067`	`)`
`19973`	`20068`
`19974`	`20069`	`def`
`@@ -20012,6 +20107,7 @@`
`20012`	`20107`	`)`
`20013`	`20108`
`20014`	`20109`	`_`
	`20110`	`+default_filename`
`20015`	`20111`	`extension`
`20016`	`20112`	`_`
`20017`	`20113`	`=`
`@@ -20030,11 +20126,7 @@`
`20030`	`20126`	`not`
`20031`	`20127`	`None`
`20032`	`20128`	`else`
`20033`		`-"`
`20034`		`-servo`
`20035`		`--`
`20036`		`-latest`
`20037`		`-"`
	`20129`	`+default_filename`
`20038`	`20130`
`20039`	`20131`	`with`
`20040`	`20132`	`open`
`@@ -20114,6 +20206,7 @@`
`20114`	`20206`	`.`
`20115`	`20207`	`pwd`
`20116`	`20208`
	`20209`	`+_`
`20117`	`20210`	`_`
`20118`	`20211`	`_`
`20119`	`20212`	`decompress`