WIP for caching

Author: timvandermeij

.github/workflows/integration_tests.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         node-version: [lts/*]
-        os: [windows-latest, ubuntu-latest]
+        os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 
@@ -45,10 +45,22 @@ jobs:
         if: ${{ matrix.os == 'windows-latest' }}
         run: Set-DisplayResolution -Width 1920 -Height 1080 -Force
 
+      - name: Restore cached PDF files
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
+        with:
+          path: test/pdfs/*.pdf
+          key: cached-pdf-files
+
       - name: Run integration tests (Windows)
         if: ${{ matrix.os == 'windows-latest' }}
         run: npx gulp integrationtest
 
       - name: Run integration tests (Linux)
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: xvfb-run -a --server-args="-screen 0, 1920x1080x24" npx gulp integrationtest
+
+      - name: Save cached PDF files
+        uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
+        with:
+          path: test/pdfs/*.pdf
+          key: cached-pdf-files

test/test.mjs

@@ -331,20 +331,17 @@ function handleSessionTimeout(session) {
   closeSession(browser);
 }
 
-function getTestManifest(label = null) {
+function getTestManifest() {
   var manifest = JSON.parse(fs.readFileSync(options.manifestFile));
 
   const testFilter = options.testfilter.slice(0);
-  if (label || testFilter.length) {
+  if (testFilter.length) {
     manifest = manifest.filter(function (item) {
       var i = testFilter.indexOf(item.id);
       if (i !== -1) {
         testFilter.splice(i, 1);
         return true;
       }
-      if (label && item.labels?.includes(label)) {
-        return true;
-      }
       return false;
     });
     if (testFilter.length) {
@@ -1071,8 +1068,8 @@ async function closeSession(browser) {
   }
 }
 
-async function ensurePDFsDownloaded(label = null) {
-  const manifest = getTestManifest(label);
+async function ensurePDFsDownloaded() {
+  const manifest = getTestManifest();
   await downloadManifestFiles(manifest);
   try {
     await verifyManifestFiles(manifest);
@@ -1116,7 +1113,7 @@ async function main() {
       await startUnitTest("/test/font/font_test.html", "font");
     } else if (options.integration) {
       // Allows linked PDF files in integration-tests as well.
-      await ensurePDFsDownloaded("integration");
+      await ensurePDFsDownloaded();
       await startIntegrationTest();
     } else {
       await startRefTest(options.masterMode, options.reftest);

test/test_manifest.json

@@ -1028,8 +1028,7 @@
     "type": "eq",
     "link": true,
     "lastPage": 1,
-    "about": "The same file as issue2337.",
-    "labels": ["integration"]
+    "about": "The same file as issue2337."
   },
   {
     "id": "freeculture",
@@ -2082,8 +2081,7 @@
     "rounds": 1,
     "link": true,
     "enableXfa": true,
-    "type": "eq",
-    "labels": ["integration"]
+    "type": "eq"
   },
   {
     "id": "xfa_bug1716380",
@@ -5167,8 +5165,7 @@
     "file": "pdfs/issue13132.pdf",
     "md5": "1b28964b9188047bc6c786302c95029f",
     "link": true,
-    "type": "other",
-    "labels": ["integration"]
+    "type": "other"
   },
   {
     "id": "issue11518",
@@ -8497,8 +8494,7 @@
     "link": true,
     "rounds": 1,
     "type": "eq",
-    "forms": true,
-    "labels": ["integration"]
+    "forms": true
   },
   {
     "id": "issue12233-print",
@@ -9113,8 +9109,7 @@
     "md5": "3ce134ead03d6158c3e8207453dcd21d",
     "rounds": 1,
     "link": true,
-    "type": "other",
-    "labels": ["integration"]
+    "type": "other"
   },
   {
     "id": "issue14301",
@@ -10002,8 +9997,7 @@
     "file": "pdfs/bug1823296.pdf",
     "md5": "f71e89ebe3d6e75e0c83ce41cd72df1f",
     "link": true,
-    "type": "other",
-    "labels": ["integration"]
+    "type": "other"
   },
   {
     "id": "bug1942064",
@@ -10447,8 +10441,7 @@
     "md5": "d2e167216493a50f732b4b3685a91792",
     "rounds": 1,
     "link": true,
-    "type": "other",
-    "labels": ["integration"]
+    "type": "other"
   },
   {
     "id": "protected-stamp-editor-save-print",
@@ -10484,8 +10477,7 @@
     "file": "pdfs/issue16863.pdf",
     "md5": "af8abe281721f92a0d46646969f061de",
     "link": true,
-    "type": "other",
-    "labels": ["integration"]
+    "type": "other"
   },
   {
     "id": "bug1851498",
@@ -10519,8 +10511,7 @@
     "firstPage": 2,
     "lastPage": 2,
     "type": "eq",
-    "forms": true,
-    "labels": ["integration"]
+    "forms": true
   },
   {
     "id": "issue17169",