From 46914fc5a75f93d33b35aee405daa135c2659858 Mon Sep 17 00:00:00 2001 From: Tim van der Meij Date: Sat, 10 Aug 2024 19:52:48 +0200 Subject: [PATCH 1/2] Remove the `test-files` directory The manifest files in this folder have been obsolete ever since April 2020 when we switched our custom browser manager to Puppeteer in https://github.com/mozilla/pdf.js/pull/11807. --- test-files/browser_manifest.json | 6 ------ test-files/browser_manifest.json-with-chrome | 10 ---------- 2 files changed, 16 deletions(-) delete mode 100644 test-files/browser_manifest.json delete mode 100644 test-files/browser_manifest.json-with-chrome diff --git a/test-files/browser_manifest.json b/test-files/browser_manifest.json deleted file mode 100644 index 727747d..0000000 --- a/test-files/browser_manifest.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "name":"firefox", - "path":"C:/Program Files (x86)/Mozilla Firefox/firefox.exe" - } -] diff --git a/test-files/browser_manifest.json-with-chrome b/test-files/browser_manifest.json-with-chrome deleted file mode 100644 index 1b1aeb1..0000000 --- a/test-files/browser_manifest.json-with-chrome +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "name":"firefox", - "path":"C:/Program Files (x86)/Mozilla Firefox/firefox.exe" - }, - { - "name":"chrome", - "path": "C:/Users/Administrator/AppData/Local/Google/Chrome/Application/chrome.exe" - } -] From 0e6449efe4cd2e109129022780f973365eea489b Mon Sep 17 00:00:00 2001 From: Tim van der Meij Date: Sat, 10 Aug 2024 19:56:19 +0200 Subject: [PATCH 2/2] Use `npm ci` instead of `npm install` This commit mirrors the change from https://github.com/mozilla/pdf.js/pull/18353 for the bots. Refer to https://docs.npmjs.com/cli/v10/commands/npm-ci for more information. --- on_cmd_browsertest.js | 4 ++-- on_cmd_integrationtest.js | 2 +- on_cmd_makeref.js | 4 ++-- on_cmd_preview.js | 2 +- on_cmd_test.js | 4 ++-- on_cmd_unittest.js | 2 +- on_cmd_xfatest.js | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/on_cmd_browsertest.js b/on_cmd_browsertest.js index 8d09edf..34337d3 100644 --- a/on_cmd_browsertest.js +++ b/on_cmd_browsertest.js @@ -3,7 +3,7 @@ require('shelljs/global'); var fail = false; -exec('npm install', {async:true}, function() { +exec('npm ci', {async:true}, function() { silent(true); @@ -101,4 +101,4 @@ silent(true); }); // exec test })(); // runTesting -}); // npm install +}); // npm ci diff --git a/on_cmd_integrationtest.js b/on_cmd_integrationtest.js index 163f298..04d5cbb 100644 --- a/on_cmd_integrationtest.js +++ b/on_cmd_integrationtest.js @@ -3,7 +3,7 @@ require('shelljs/global'); var fail = false; -exec('npm install', {async:false}); +exec('npm ci', {async:false}); silent(true); diff --git a/on_cmd_makeref.js b/on_cmd_makeref.js index e1a31c2..b8887b4 100644 --- a/on_cmd_makeref.js +++ b/on_cmd_makeref.js @@ -1,7 +1,7 @@ var botio = require(process.env['BOTIO_MODULE']); require('shelljs/global'); -exec('npm install', {async:true}, function() { +exec('npm ci', {async:true}, function() { silent(true); // @@ -61,4 +61,4 @@ exec('npm install', {async:true}, function() { mkdir('-p', __dirname+'/pdf-cache'); cp('./test/pdfs/*.pdf', __dirname+'/pdf-cache'); }); // exec makeref -}); // npm install +}); // npm ci diff --git a/on_cmd_preview.js b/on_cmd_preview.js index b098c3d..41706c7 100644 --- a/on_cmd_preview.js +++ b/on_cmd_preview.js @@ -1,6 +1,6 @@ var botio = require(process.env['BOTIO_MODULE']); require('shelljs/global'); -exec('npm install'); +exec('npm ci'); echo(); echo('>> Making web site'); diff --git a/on_cmd_test.js b/on_cmd_test.js index ecaad9a..f556fd0 100644 --- a/on_cmd_test.js +++ b/on_cmd_test.js @@ -3,7 +3,7 @@ require('shelljs/global'); var fail = false; -exec('npm install', {async:true}, function() { +exec('npm ci', {async:true}, function() { silent(true); @@ -115,4 +115,4 @@ silent(true); }); // exec test })(); // runTesting -}); // npm install +}); // npm ci diff --git a/on_cmd_unittest.js b/on_cmd_unittest.js index ce49adb..4c71f46 100644 --- a/on_cmd_unittest.js +++ b/on_cmd_unittest.js @@ -3,7 +3,7 @@ require('shelljs/global'); var fail = false; -exec('npm install', {async:false}); +exec('npm ci', {async:false}); silent(true); diff --git a/on_cmd_xfatest.js b/on_cmd_xfatest.js index cedd74b..a6d28b4 100644 --- a/on_cmd_xfatest.js +++ b/on_cmd_xfatest.js @@ -3,7 +3,7 @@ require('shelljs/global'); var fail = false; -exec('npm install', {async:true}, function() { +exec('npm ci', {async:true}, function() { silent(true); @@ -115,4 +115,4 @@ silent(true); }); // exec test })(); // runTesting -}); // npm install +}); // npm ci