update workflows

hhu-adam · Aug 24, 2024 · c419b9a · c419b9a
1 parent 5cd1395
commit c419b9a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -9,9 +9,6 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
-defaults:
-  run:
-    shell: bash
 jobs:
   build:
     name: 'Build image'
@@ -56,10 +53,13 @@ jobs:
           path: /tmp
       - name: Load server image
         run: docker load --input /tmp/lean4monaco.tar
+        shell: bash
       - name: Start server
         run: docker run -dit -p 5173:5173 -p 8080:8080 lean4monaco
+        shell: bash
       - name: Run tests (electron)
         uses: cypress-io/github-action@v6
         with:
           browser: electron
           wait-on: 'http://localhost:5173'
+          shell: bash
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,9 +11,6 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
-defaults:
-  run:
-    shell: bash
 jobs:
   test:
     strategy:
@@ -22,7 +19,7 @@ jobs:
         os:
           - ubuntu-latest
           - macos-latest
-          - windows-latest
+          # - windows-latest
         browser:
           - electron
           - chrome
@@ -33,14 +30,16 @@ jobs:
             name: Linux
           - os: macos-latest
             name: macOS
+          # currently only one Windows test
           - os: windows-latest
             name: Windows
-          - os: windows-latest
-            name: Windows
-            browser: edge
-        exclude:
-          - os: windows-latest
-            browser: webkit
+            browser: electron
+          # - os: windows-latest
+          #   name: Windows
+          #   browser: edge
+        # exclude:
+        #   - os: windows-latest
+        #     browser: webkit
 
     name: ${{ matrix.name }} - ${{ matrix.browser }}
     runs-on: ${{ matrix.os }}
@@ -53,6 +52,7 @@ jobs:
       - name: Setup webkit (Linux)
         if: matrix.os == 'ubuntu-latest' && matrix.browser == 'webkit'
         run: npx playwright install-deps webkit
+        shell: bash
       - uses: actions/checkout@v4
         with:
           submodules: true
@@ -71,12 +71,21 @@ jobs:
           curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf > elan-init.sh
           bash elan-init.sh -y
           echo "$(realpath ~/.elan/bin)" >> $GITHUB_PATH
+        shell: bash
       - uses: actions/setup-node@v4
       - run: npm install
-      # - run: npm run setup_demo  # included in the next step
+        shell: bash
+      - run: npm run setup_demo
+        if: matrix.os != 'windows-latest'
+        shell: bash
       - name: Run tests
+        if: matrix.os != 'windows-latest'
         uses: cypress-io/github-action@v6
         with:
           start: npm start
           wait-on: 'http://localhost:5173'
           browser: ${{ matrix.browser }}
+      - name: Run test (Windows)
+        run: npm test
+        if: matrix.os == 'windows-latest'
+        shell: bash