Merge pull request #910 from NeurodataWithoutBorders/puppeteer

Update puppeteer, re-enable mac CI, split e2e CI
NeurodataWithoutBorders · Aug 14, 2024 · 0970093 · 0970093
2 parents 08e2b06 + 00b7e8f
commit 0970093
Show file tree

Hide file tree

Showing 13 changed files with 246 additions and 221 deletions.
diff --git a/.github/workflows/example_data_cache.yml b/.github/workflows/example_data_cache.yml
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.12"]
-        os: [ubuntu-latest, windows-latest] #,macos-latest, macos-13]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
 
     steps:
 

diff --git a/.github/workflows/testing_dev.yml b/.github/workflows/testing_dev.yml
@@ -23,16 +23,11 @@ jobs:
           - os: ubuntu-latest
             label: environments/environment-Linux.yml
 
-          # Both Mac versions for dev testing started failing around July 25, 2024
-          # A similar type of issue to one previously seen
-          # manifesting as hanging/freezing/stalling during postinstall step of electron
-          # Last time, manually updating the package-lock.json file was enough to fix the issue
-          # But that didn't work this time
-#          - os: macos-latest  # Mac arm64 runner
-#            label: environments/environment-MAC-apple-silicon.yml
-#
-#          - os: macos-13  # Mac x64 runner
-#            label: environments/environment-MAC-intel.yml
+          - os: macos-latest  # Mac arm64 runner
+            label: environments/environment-MAC-apple-silicon.yml
+
+          - os: macos-13  # Mac x64 runner
+            label: environments/environment-MAC-intel.yml
 
 #          - os: windows-latest
 #            label: environments/environment-Windows.yml

diff --git a/.github/workflows/testing_dev_with_live_services.yml b/.github/workflows/testing_dev_with_live_services.yml
@@ -25,16 +25,11 @@ jobs:
           - os: ubuntu-latest
             label: environments/environment-Linux.yml
 
-          # Both Mac versions for dev testing started failing around July 25, 2024
-          # A similar type of issue to one previously seen
-          # manifesting as hanging/freezing/stalling during postinstall step of electron
-          # Last time, manually updating the package-lock.json file was enough to fix the issue
-          # But that didn't work this time
-#          - os: macos-latest  # Mac arm64 runner
-#            label: environments/environment-MAC-apple-silicon.yml
-#
-#          - os: macos-13  # Mac x64 runner
-#            label: environments/environment-MAC-intel.yml
+          - os: macos-latest  # Mac arm64 runner
+            label: environments/environment-MAC-apple-silicon.yml
+
+          - os: macos-13  # Mac x64 runner
+            label: environments/environment-MAC-intel.yml
 
 #          - os: windows-latest
 #            label: environments/environment-Windows.yml

diff --git a/.github/workflows/testing_flask_build_and_dist.yml b/.github/workflows/testing_flask_build_and_dist.yml
@@ -19,25 +19,14 @@ jobs:
         include:
           # No linux in this matrix since installation instructions use dev mode instead of distributable
 
-          # Both Mac versions for dev testing started failing around July 25, 2024
-          # A similar type of issue to one previously seen
-          # manifesting as hanging/freezing/stalling during postinstall step of electron
-          # Last time, manually updating the package-lock.json file was enough to fix the issue
-          # But that didn't work this time
-#          - python-version: "3.9"
-#            os: macos-latest  # Mac arm64 runner
-#            label: environments/environment-MAC-apple-silicon.yml
-#            prefix: /Users/runner/miniconda3/envs/nwb-guide
-#
-#          - python-version: "3.9"
-#            os: macos-13  # Mac x64 runner
-#            label: environments/environment-MAC-intel.yml
-#            prefix: /Users/runner/miniconda3/envs/nwb-guide
-
-          - python-version: "3.9"
-            os: windows-latest
+          - os: macos-latest  # Mac arm64 runner
+            label: environments/environment-MAC-apple-silicon.yml
+
+          - os: macos-13  # Mac x64 runner
+            label: environments/environment-MAC-intel.yml
+
+          - os: windows-latest
             label: environments/environment-Windows.yml
-            prefix: C:\Miniconda3\envs\nwb-guide
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/testing_pipelines.yml b/.github/workflows/testing_pipelines.yml
@@ -21,21 +21,15 @@ jobs:
 #          - os: ubuntu-latest
 #            label: environments/environment-Linux.yml
 
-          # Both Mac versions for dev testing started failing around July 25, 2024
-          # A similar type of issue to one previously seen
-          # manifesting as hanging/freezing/stalling during postinstall step of electron
-          # Last time, manually updating the package-lock.json file was enough to fix the issue
-          # But that didn't work this time
-#          - os: macos-latest  # Mac arm64 runner
-#            label: environments/environment-MAC-apple-silicon.yml
-#
-#          - os: macos-13  # Mac x64 runner
-#            label: environments/environment-MAC-intel.yml
+          - os: macos-latest  # Mac arm64 runner
+            label: environments/environment-MAC-apple-silicon.yml
+
+          - os: macos-13  # Mac x64 runner
+            label: environments/environment-MAC-intel.yml
 
           - os: windows-latest
             label: environments/environment-Windows.yml
 
-
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow --tags