plotly · archmoj · Aug 12, 2024 · Aug 9, 2024 · Aug 9, 2024 · Aug 9, 2024
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,7 +28,7 @@ jobs:
 
   install-and-cibuild: # main cibuild using node 16 & npm 7
     docker:
-      - image: cimg/node:16.17.1
+      - image: cimg/node:16.20.2
     working_directory: ~/plotly.js
     steps:
       - checkout
@@ -52,7 +52,7 @@ jobs:
   timezone-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.17.1-browsers
+      - image: cimg/node:16.20.2-browsers
     working_directory: ~/plotly.js
     steps:
       - browser-tools/install-browser-tools: &browser-versions
@@ -84,7 +84,7 @@ jobs:
   no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.17.1-browsers
+      - image: cimg/node:16.20.2-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
@@ -103,7 +103,7 @@ jobs:
   webgl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.17.1-browsers
+      - image: cimg/node:16.20.2-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
@@ -122,7 +122,7 @@ jobs:
   virtual-webgl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.17.1-browsers
+      - image: cimg/node:16.20.2-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
@@ -141,7 +141,7 @@ jobs:
   flaky-no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.17.1-browsers
+      - image: cimg/node:16.20.2-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
@@ -159,7 +159,7 @@ jobs:
   bundle-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.17.1-browsers
+      - image: cimg/node:16.20.2-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
@@ -174,48 +174,10 @@ jobs:
           name: Run jasmine tests (part D)
           command: .circleci/test.sh bundle-jasmine
 
-  mathjax-firefox81:
-    docker:
-      # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.17.1-browsers
-    environment:
-      # Alaska time (arbitrary timezone to test date logic)
-      TZ: "America/Anchorage"
-    working_directory: ~/plotly.js
-    steps:
-      - browser-tools/install-browser-tools: &browser-versions
-          firefox-version: '81.0'
-          install-chrome: false
-          install-chromedriver: false
-      - attach_workspace:
-          at: ~/
-      - run:
-          name: Test MathJax on firefox-81
-          command: .circleci/test.sh mathjax-firefox
-
-  mathjax-firefox82:
-    docker:
-      # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.17.1-browsers
-    environment:
-      # Alaska time (arbitrary timezone to test date logic)
-      TZ: "America/Anchorage"
-    working_directory: ~/plotly.js
-    steps:
-      - browser-tools/install-browser-tools: &browser-versions
-          firefox-version: '82.0'
-          install-chrome: false
-          install-chromedriver: false
-      - attach_workspace:
-          at: ~/
-      - run:
-          name: Test MathJax on firefox-82
-          command: .circleci/test.sh mathjax-firefox82+
-
   mathjax-firefoxLatest:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.17.1-browsers
+      - image: cimg/node:16.20.2-browsers
     environment:
       # Alaska time (arbitrary timezone to test date logic)
       TZ: "America/Anchorage"
@@ -228,7 +190,7 @@ jobs:
           at: ~/
       - run:
           name: Test MathJax on firefox-latest
-          command: .circleci/test.sh mathjax-firefox82+
+          command: .circleci/test.sh mathjax-firefox
 
   make-baselines-virtual-webgl:
     parallelism: 8
@@ -307,7 +269,7 @@ jobs:
 
   test-baselines:
     docker:
-      - image: circleci/node:16.9.0
+      - image: cimg/node:16.20.2
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -321,7 +283,7 @@ jobs:
 
   test-baselines-virtual-webgl:
     docker:
-      - image: circleci/node:16.9.0
+      - image: cimg/node:16.20.2
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -335,7 +297,7 @@ jobs:
 
   test-baselines-b64:
     docker:
-      - image: circleci/node:16.9.0
+      - image: cimg/node:16.20.2
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -349,7 +311,7 @@ jobs:
 
   test-baselines-mathjax3:
     docker:
-      - image: circleci/node:16.9.0
+      - image: cimg/node:16.20.2
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -386,7 +348,7 @@ jobs:
 
   test-exports:
     docker:
-      - image: circleci/node:16.9.0
+      - image: cimg/node:16.20.2
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -400,7 +362,7 @@ jobs:
 
   mock-validation:
     docker:
-      - image: cimg/node:16.17.1
+      - image: cimg/node:16.20.2
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -414,7 +376,7 @@ jobs:
 
   source-syntax:
     docker:
-      - image: cimg/node:16.17.1
+      - image: cimg/node:16.20.2
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -425,7 +387,7 @@ jobs:
 
   publish-dist:
     docker:
-      - image: cimg/node:16.17.1
+      - image: cimg/node:16.20.2
     working_directory: ~/plotly.js
     steps:
       - checkout
@@ -495,7 +457,7 @@ jobs:
 
   test-stackgl-bundle:
     docker:
-      - image: cimg/node:16.17.1
+      - image: cimg/node:16.20.2
     working_directory: ~/plotly.js
     steps:
       - checkout
@@ -525,12 +487,6 @@ workflows:
       - bundle-jasmine:
           requires:
             - install-and-cibuild
-      - mathjax-firefox81:
-          requires:
-            - install-and-cibuild
-      - mathjax-firefox82:
-          requires:
-            - install-and-cibuild
       - mathjax-firefoxLatest:
           requires:
             - install-and-cibuild

diff --git a/.circleci/test.sh b/.circleci/test.sh
@@ -84,9 +84,9 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
-    mathjax-firefox82+)
-        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --skip-tags=noFF82 --nowatch &&
-        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --skip-tags=noFF82 --nowatch &&
+    mathjax-firefox)
+        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --nowatch &&
+        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --nowatch &&
         ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --mathjax3 --nowatch &&
         ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --nowatch || EXIT_STATE=$?
         exit $EXIT_STATE

diff --git a/draftlogs/7080_change.md b/draftlogs/7080_change.md
@@ -0,0 +1,2 @@
+ - Use cimg/node instead of circleci/node in CI [[#7080](https://github.com/plotly/plotly.js/pull/7080)]
+
diff --git a/tasks/test_syntax.js b/tasks/test_syntax.js
@@ -31,7 +31,7 @@ assertCircularDeps();
 // check for for focus and exclude jasmine blocks
 function assertJasmineSuites() {
     var BLACK_LIST = ['fdescribe', 'fit', 'xdescribe', 'xit'];
-    var TAGS = ['noCI', 'noCIdep', 'noFF82', 'gl', 'flaky'];
+    var TAGS = ['noCI', 'noCIdep', 'gl', 'flaky'];
     var IT_ONLY_TAGS = ['gl', 'flaky'];
     var logs = [];
 

diff --git a/test/jasmine/bundle_tests/mathjax_test.js b/test/jasmine/bundle_tests/mathjax_test.js
@@ -95,24 +95,26 @@ describe('Test MathJax v' + mathjaxVersion + ':', function() {
             .then(done, done.fail);
         });
 
-        it('@noFF82 should scoot x-axis title (with MathJax) below x-axis ticks', function(done) {
-            expect(window.MathJax).toBeDefined();
 
-            testTitleScoot({
-                data: [{
-                    y: [1, 2, 1]
-                }],
-                layout: {
-                    xaxis: {title: texTitle},
-                    width: 500,
-                    height: 500,
-                    margin: {t: 100, b: 100, l: 100, r: 100}
-                }
-            }, {
-                xCategories: longCats
-            })
-            .then(done, done.fail);
-        });
+        // Firefox bug - see https://bugzilla.mozilla.org/show_bug.cgi?id=1350755
+        // it('should scoot x-axis title (with MathJax) below x-axis ticks', function(done) {
+        //     expect(window.MathJax).toBeDefined();
+
+        //     testTitleScoot({
+        //         data: [{
+        //             y: [1, 2, 1]
+        //         }],
+        //         layout: {
+        //             xaxis: {title: texTitle},
+        //             width: 500,
+        //             height: 500,
+        //             margin: {t: 100, b: 100, l: 100, r: 100}
+        //         }
+        //     }, {
+        //         xCategories: longCats
+        //     })
+        //     .then(done, done.fail);
+        // });
 
         it('should scoot x-axis title below x-axis ticks (with MathJax)', function(done) {
             expect(window.MathJax).toBeDefined();
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Use cimg/node instead of circleci/node in CI [[#7080](https://github.com/plotly/plotly.js/pull/7080)]