diff --git a/app/common/adapter/binary/PlaywrightBinary.ts b/app/common/adapter/binary/PlaywrightBinary.ts index 848e248b..bc6fbea2 100644 --- a/app/common/adapter/binary/PlaywrightBinary.ts +++ b/app/common/adapter/binary/PlaywrightBinary.ts @@ -13,17 +13,15 @@ const DOWNLOAD_HOST = 'https://playwright.azureedge.net/'; const DOWNLOAD_PATHS = { 'chromium': { '': undefined, - 'generic-linux': 'builds/chromium/%s/chromium-linux.zip', - 'generic-linux-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip', - 'ubuntu18.04': 'builds/chromium/%s/chromium-linux.zip', - 'ubuntu20.04': 'builds/chromium/%s/chromium-linux.zip', - 'ubuntu22.04': 'builds/chromium/%s/chromium-linux.zip', - 'ubuntu18.04-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip', + 'ubuntu18.04-x64': undefined, + 'ubuntu20.04-x64': 'builds/chromium/%s/chromium-linux.zip', + 'ubuntu22.04-x64': 'builds/chromium/%s/chromium-linux.zip', + 'ubuntu18.04-arm64': undefined, 'ubuntu20.04-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip', 'ubuntu22.04-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip', - 'debian11': 'builds/chromium/%s/chromium-linux.zip', + 'debian11-x64': 'builds/chromium/%s/chromium-linux.zip', 'debian11-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip', - 'debian12': 'builds/chromium/%s/chromium-linux.zip', + 'debian12-x64': 'builds/chromium/%s/chromium-linux.zip', 'debian12-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip', 'mac10.13': 'builds/chromium/%s/chromium-mac.zip', 'mac10.14': 'builds/chromium/%s/chromium-mac.zip', @@ -34,21 +32,21 @@ const DOWNLOAD_PATHS = { 'mac12-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip', 'mac13': 'builds/chromium/%s/chromium-mac.zip', 'mac13-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip', + 'mac14': 'builds/chromium/%s/chromium-mac.zip', + 'mac14-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip', 'win64': 'builds/chromium/%s/chromium-win64.zip', }, 'chromium-tip-of-tree': { '': undefined, - 'generic-linux': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip', - 'generic-linux-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip', - 'ubuntu18.04': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip', - 'ubuntu20.04': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip', - 'ubuntu22.04': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip', - 'ubuntu18.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip', + 'ubuntu18.04-x64': undefined, + 'ubuntu20.04-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip', + 'ubuntu22.04-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip', + 'ubuntu18.04-arm64': undefined, 'ubuntu20.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip', 'ubuntu22.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip', - 'debian11': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip', + 'debian11-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip', 'debian11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip', - 'debian12': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip', + 'debian12-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip', 'debian12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip', 'mac10.13': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip', 'mac10.14': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip', @@ -59,47 +57,22 @@ const DOWNLOAD_PATHS = { 'mac12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip', 'mac13': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip', 'mac13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip', + 'mac14': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip', + 'mac14-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip', 'win64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-win64.zip', }, - 'chromium-with-symbols': { - '': undefined, - 'generic-linux': 'builds/chromium/%s/chromium-with-symbols-linux.zip', - 'generic-linux-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip', - 'ubuntu18.04': 'builds/chromium/%s/chromium-with-symbols-linux.zip', - 'ubuntu20.04': 'builds/chromium/%s/chromium-with-symbols-linux.zip', - 'ubuntu22.04': 'builds/chromium/%s/chromium-with-symbols-linux.zip', - 'ubuntu18.04-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip', - 'ubuntu20.04-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip', - 'ubuntu22.04-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip', - 'debian11': 'builds/chromium/%s/chromium-with-symbols-linux.zip', - 'debian11-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip', - 'debian12': 'builds/chromium/%s/chromium-with-symbols-linux.zip', - 'debian12-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip', - 'mac10.13': 'builds/chromium/%s/chromium-with-symbols-mac.zip', - 'mac10.14': 'builds/chromium/%s/chromium-with-symbols-mac.zip', - 'mac10.15': 'builds/chromium/%s/chromium-with-symbols-mac.zip', - 'mac11': 'builds/chromium/%s/chromium-with-symbols-mac.zip', - 'mac11-arm64': 'builds/chromium/%s/chromium-with-symbols-mac-arm64.zip', - 'mac12': 'builds/chromium/%s/chromium-with-symbols-mac.zip', - 'mac12-arm64': 'builds/chromium/%s/chromium-with-symbols-mac-arm64.zip', - 'mac13': 'builds/chromium/%s/chromium-with-symbols-mac.zip', - 'mac13-arm64': 'builds/chromium/%s/chromium-with-symbols-mac-arm64.zip', - 'win64': 'builds/chromium/%s/chromium-with-symbols-win64.zip', - }, 'firefox': { '': undefined, - 'generic-linux': 'builds/firefox/%s/firefox-ubuntu-20.04.zip', - 'generic-linux-arm64': 'builds/firefox/%s/firefox-ubuntu-20.04-arm64.zip', - 'ubuntu18.04': 'builds/firefox/%s/firefox-ubuntu-18.04.zip', - 'ubuntu20.04': 'builds/firefox/%s/firefox-ubuntu-20.04.zip', - 'ubuntu22.04': 'builds/firefox/%s/firefox-ubuntu-22.04.zip', + 'ubuntu18.04-x64': undefined, + 'ubuntu20.04-x64': 'builds/firefox/%s/firefox-ubuntu-20.04.zip', + 'ubuntu22.04-x64': 'builds/firefox/%s/firefox-ubuntu-22.04.zip', 'ubuntu18.04-arm64': undefined, 'ubuntu20.04-arm64': 'builds/firefox/%s/firefox-ubuntu-20.04-arm64.zip', 'ubuntu22.04-arm64': 'builds/firefox/%s/firefox-ubuntu-22.04-arm64.zip', - 'debian11': 'builds/firefox/%s/firefox-debian-11.zip', + 'debian11-x64': 'builds/firefox/%s/firefox-debian-11.zip', 'debian11-arm64': 'builds/firefox/%s/firefox-debian-11-arm64.zip', - 'debian12': undefined, - 'debian12-arm64': undefined, + 'debian12-x64': 'builds/firefox/%s/firefox-debian-12.zip', + 'debian12-arm64': 'builds/firefox/%s/firefox-debian-12-arm64.zip', 'mac10.13': 'builds/firefox/%s/firefox-mac-13.zip', 'mac10.14': 'builds/firefox/%s/firefox-mac-13.zip', 'mac10.15': 'builds/firefox/%s/firefox-mac-13.zip', @@ -109,22 +82,22 @@ const DOWNLOAD_PATHS = { 'mac12-arm64': 'builds/firefox/%s/firefox-mac-13-arm64.zip', 'mac13': 'builds/firefox/%s/firefox-mac-13.zip', 'mac13-arm64': 'builds/firefox/%s/firefox-mac-13-arm64.zip', + 'mac14': 'builds/firefox/%s/firefox-mac-13.zip', + 'mac14-arm64': 'builds/firefox/%s/firefox-mac-13-arm64.zip', 'win64': 'builds/firefox/%s/firefox-win64.zip', }, 'firefox-beta': { '': undefined, - 'generic-linux': 'builds/firefox-beta/%s/firefox-beta-ubuntu-20.04.zip', - 'generic-linux-arm64': undefined, - 'ubuntu18.04': 'builds/firefox-beta/%s/firefox-beta-ubuntu-18.04.zip', - 'ubuntu20.04': 'builds/firefox-beta/%s/firefox-beta-ubuntu-20.04.zip', - 'ubuntu22.04': 'builds/firefox-beta/%s/firefox-beta-ubuntu-22.04.zip', + 'ubuntu18.04-x64': undefined, + 'ubuntu20.04-x64': 'builds/firefox-beta/%s/firefox-beta-ubuntu-20.04.zip', + 'ubuntu22.04-x64': 'builds/firefox-beta/%s/firefox-beta-ubuntu-22.04.zip', 'ubuntu18.04-arm64': undefined, 'ubuntu20.04-arm64': undefined, 'ubuntu22.04-arm64': 'builds/firefox-beta/%s/firefox-beta-ubuntu-22.04-arm64.zip', - 'debian11': 'builds/firefox-beta/%s/firefox-beta-debian-11.zip', + 'debian11-x64': 'builds/firefox-beta/%s/firefox-beta-debian-11.zip', 'debian11-arm64': 'builds/firefox-beta/%s/firefox-beta-debian-11-arm64.zip', - 'debian12': undefined, - 'debian12-arm64': undefined, + 'debian12-x64': 'builds/firefox-beta/%s/firefox-beta-debian-12.zip', + 'debian12-arm64': 'builds/firefox-beta/%s/firefox-beta-debian-12-arm64.zip', 'mac10.13': 'builds/firefox-beta/%s/firefox-beta-mac-13.zip', 'mac10.14': 'builds/firefox-beta/%s/firefox-beta-mac-13.zip', 'mac10.15': 'builds/firefox-beta/%s/firefox-beta-mac-13.zip', @@ -134,22 +107,22 @@ const DOWNLOAD_PATHS = { 'mac12-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-13-arm64.zip', 'mac13': 'builds/firefox-beta/%s/firefox-beta-mac-13.zip', 'mac13-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-13-arm64.zip', + 'mac14': 'builds/firefox-beta/%s/firefox-beta-mac-13.zip', + 'mac14-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-13-arm64.zip', 'win64': 'builds/firefox-beta/%s/firefox-beta-win64.zip', }, 'webkit': { '': undefined, - 'generic-linux': 'builds/webkit/%s/webkit-ubuntu-20.04.zip', - 'generic-linux-arm64': 'builds/webkit/%s/webkit-ubuntu-20.04-arm64.zip', - 'ubuntu18.04': 'builds/deprecated-webkit-ubuntu-18.04/%s/deprecated-webkit-ubuntu-18.04.zip', - 'ubuntu20.04': 'builds/webkit/%s/webkit-ubuntu-20.04.zip', - 'ubuntu22.04': 'builds/webkit/%s/webkit-ubuntu-22.04.zip', + 'ubuntu18.04-x64': undefined, + 'ubuntu20.04-x64': 'builds/webkit/%s/webkit-ubuntu-20.04.zip', + 'ubuntu22.04-x64': 'builds/webkit/%s/webkit-ubuntu-22.04.zip', 'ubuntu18.04-arm64': undefined, 'ubuntu20.04-arm64': 'builds/webkit/%s/webkit-ubuntu-20.04-arm64.zip', 'ubuntu22.04-arm64': 'builds/webkit/%s/webkit-ubuntu-22.04-arm64.zip', - 'debian11': 'builds/webkit/%s/webkit-debian-11.zip', + 'debian11-x64': 'builds/webkit/%s/webkit-debian-11.zip', 'debian11-arm64': 'builds/webkit/%s/webkit-debian-11-arm64.zip', - 'debian12': undefined, - 'debian12-arm64': undefined, + 'debian12-x64': 'builds/webkit/%s/webkit-debian-12.zip', + 'debian12-arm64': 'builds/webkit/%s/webkit-debian-12-arm64.zip', 'mac10.13': undefined, 'mac10.14': 'builds/deprecated-webkit-mac-10.14/%s/deprecated-webkit-mac-10.14.zip', 'mac10.15': 'builds/deprecated-webkit-mac-10.15/%s/deprecated-webkit-mac-10.15.zip', @@ -159,21 +132,21 @@ const DOWNLOAD_PATHS = { 'mac12-arm64': 'builds/webkit/%s/webkit-mac-12-arm64.zip', 'mac13': 'builds/webkit/%s/webkit-mac-13.zip', 'mac13-arm64': 'builds/webkit/%s/webkit-mac-13-arm64.zip', + 'mac14': 'builds/webkit/%s/webkit-mac-14.zip', + 'mac14-arm64': 'builds/webkit/%s/webkit-mac-14-arm64.zip', 'win64': 'builds/webkit/%s/webkit-win64.zip', }, 'ffmpeg': { '': undefined, - 'generic-linux': 'builds/ffmpeg/%s/ffmpeg-linux.zip', - 'generic-linux-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip', - 'ubuntu18.04': 'builds/ffmpeg/%s/ffmpeg-linux.zip', - 'ubuntu20.04': 'builds/ffmpeg/%s/ffmpeg-linux.zip', - 'ubuntu22.04': 'builds/ffmpeg/%s/ffmpeg-linux.zip', - 'ubuntu18.04-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip', + 'ubuntu18.04-x64': undefined, + 'ubuntu20.04-x64': 'builds/ffmpeg/%s/ffmpeg-linux.zip', + 'ubuntu22.04-x64': 'builds/ffmpeg/%s/ffmpeg-linux.zip', + 'ubuntu18.04-arm64': undefined, 'ubuntu20.04-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip', 'ubuntu22.04-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip', - 'debian11': 'builds/ffmpeg/%s/ffmpeg-linux.zip', + 'debian11-x64': 'builds/ffmpeg/%s/ffmpeg-linux.zip', 'debian11-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip', - 'debian12': 'builds/ffmpeg/%s/ffmpeg-linux.zip', + 'debian12-x64': 'builds/ffmpeg/%s/ffmpeg-linux.zip', 'debian12-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip', 'mac10.13': 'builds/ffmpeg/%s/ffmpeg-mac.zip', 'mac10.14': 'builds/ffmpeg/%s/ffmpeg-mac.zip', @@ -184,10 +157,34 @@ const DOWNLOAD_PATHS = { 'mac12-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip', 'mac13': 'builds/ffmpeg/%s/ffmpeg-mac.zip', 'mac13-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip', + 'mac14': 'builds/ffmpeg/%s/ffmpeg-mac.zip', + 'mac14-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip', 'win64': 'builds/ffmpeg/%s/ffmpeg-win64.zip', }, 'android': { '': 'builds/android/%s/android.zip', + 'ubuntu18.04-x64': undefined, + 'ubuntu20.04-x64': 'builds/android/%s/android.zip', + 'ubuntu22.04-x64': 'builds/android/%s/android.zip', + 'ubuntu18.04-arm64': undefined, + 'ubuntu20.04-arm64': 'builds/android/%s/android.zip', + 'ubuntu22.04-arm64': 'builds/android/%s/android.zip', + 'debian11-x64': 'builds/android/%s/android.zip', + 'debian11-arm64': 'builds/android/%s/android.zip', + 'debian12-x64': 'builds/android/%s/android.zip', + 'debian12-arm64': 'builds/android/%s/android.zip', + 'mac10.13': 'builds/android/%s/android.zip', + 'mac10.14': 'builds/android/%s/android.zip', + 'mac10.15': 'builds/android/%s/android.zip', + 'mac11': 'builds/android/%s/android.zip', + 'mac11-arm64': 'builds/android/%s/android.zip', + 'mac12': 'builds/android/%s/android.zip', + 'mac12-arm64': 'builds/android/%s/android.zip', + 'mac13': 'builds/android/%s/android.zip', + 'mac13-arm64': 'builds/android/%s/android.zip', + 'mac14': 'builds/android/%s/android.zip', + 'mac14-arm64': 'builds/android/%s/android.zip', + 'win64': 'builds/android/%s/android.zip', }, } as const; diff --git a/test/common/adapter/binary/PlaywrightBinary.test.ts b/test/common/adapter/binary/PlaywrightBinary.test.ts index 6cbd2e0e..a7d5c0d8 100644 --- a/test/common/adapter/binary/PlaywrightBinary.test.ts +++ b/test/common/adapter/binary/PlaywrightBinary.test.ts @@ -51,19 +51,18 @@ describe('test/common/adapter/binary/PlaywrightBinary.test.ts', () => { let result = await binary.fetch('/builds/'); assert(result); // console.log(result.items); - assert.equal(result.items.length, 8); + assert.equal(result.items.length, 7); assert.equal(result.items[0].name, 'chromium/'); assert.equal(result.items[1].name, 'chromium-tip-of-tree/'); - assert.equal(result.items[2].name, 'chromium-with-symbols/'); - assert.equal(result.items[3].name, 'firefox/'); - assert.equal(result.items[4].name, 'firefox-beta/'); - assert.equal(result.items[5].name, 'webkit/'); - assert.equal(result.items[6].name, 'ffmpeg/'); - assert.equal(result.items[7].name, 'android/'); + assert.equal(result.items[2].name, 'firefox/'); + assert.equal(result.items[3].name, 'firefox-beta/'); + assert.equal(result.items[4].name, 'webkit/'); + assert.equal(result.items[5].name, 'ffmpeg/'); + assert.equal(result.items[6].name, 'android/'); assert.equal(result.items[0].isDir, true); const names = [ - 'chromium', 'chromium-tip-of-tree', 'chromium-with-symbols', 'firefox', 'firefox-beta', + 'chromium', 'chromium-tip-of-tree', 'firefox', 'firefox-beta', 'webkit', 'ffmpeg', ]; for (const dirname of names) {