Update puppeteer, re-enable mac CI, split e2e CI

NeurodataWithoutBorders · Aug 13, 2024 · aceb9e1 · aceb9e1
1 parent 74bb026
commit aceb9e1
Show file tree

Hide file tree

Showing 9 changed files with 263 additions and 226 deletions.
diff --git a/.github/workflows/deploy_tests_on_pull_request.yml b/.github/workflows/deploy_tests_on_pull_request.yml
@@ -9,17 +9,6 @@ concurrency:
 
 jobs:
 
-  DevTests:
-    uses: ./.github/workflows/testing_dev.yml
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
-  LiveServices:
-    uses: ./.github/workflows/testing_dev_with_live_services.yml
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      DANDI_STAGING_API_KEY: ${{ secrets.DANDI_STAGING_API_KEY }}
-
   BuildTests:
     uses: ./.github/workflows/testing_flask_build_and_dist.yml
 

diff --git a/.github/workflows/e2e_tests_on_pull_request.yml b/.github/workflows/e2e_tests_on_pull_request.yml
@@ -0,0 +1,21 @@
+name: E2E Tests
+
+on:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+
+  DevTests:
+    uses: ./.github/workflows/testing_dev.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  LiveServices:
+    uses: ./.github/workflows/testing_dev_with_live_services.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      DANDI_STAGING_API_KEY: ${{ secrets.DANDI_STAGING_API_KEY }}
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
@@ -18,26 +18,17 @@ jobs:
       matrix:
         include:
           # No linux in this matrix since installation instructions use dev mode instead of distributable
+          - 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
-#          - 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