revert removing windows

TheBevyFlock · May 27, 2024 · 513d1c4 · 513d1c4
1 parent e4f2370
commit 513d1c4
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 19 deletions.
diff --git a/.github/workflows/report-main.yml b/.github/workflows/report-main.yml
@@ -50,7 +50,6 @@ jobs:
     name: Native
     needs: [get-environment]
     uses: ./.github/workflows/workflow-native.yml
-    if: needs.get-environment.outputs.updated == 'true' || github.event_name == 'workflow_dispatch'
     with:
       gitref: ${{ needs.get-environment.outputs.gitref }}
       pixeleagle_project: ${{ needs.get-environment.outputs.pixeleagle_project }}
@@ -120,16 +119,16 @@ jobs:
           grep . Linux-failures-concat > results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/Linux-failures || true
           grep . Linux-no_screenshots-concat > results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/Linux-no_screenshots || true
 
-          # for report in status-Windows-*
-          # do
-          #   (cat $report/successes; echo) >> Windows-successes-concat
-          #   (cat $report/failures; echo) >> Windows-failures-concat
-          #   (cat $report/no_screenshots; echo) >> Windows-no_screenshots-concat
-          # done
-          # # remove empty lines
-          # grep . Windows-successes-concat > results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/Windows-successes || true
-          # grep . Windows-failures-concat > results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/Windows-failures || true
-          # grep . Windows-no_screenshots-concat > results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/Windows-no_screenshots || true
+          for report in status-Windows-*
+          do
+            (cat $report/successes; echo) >> Windows-successes-concat
+            (cat $report/failures; echo) >> Windows-failures-concat
+            (cat $report/no_screenshots; echo) >> Windows-no_screenshots-concat
+          done
+          # remove empty lines
+          grep . Windows-successes-concat > results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/Windows-successes || true
+          grep . Windows-failures-concat > results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/Windows-failures || true
+          grep . Windows-no_screenshots-concat > results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/Windows-no_screenshots || true
 
           for report in status-macOS-*
           do
@@ -154,7 +153,7 @@ jobs:
       - name: Save Pixel Eagle results
         run: |
           mv pixeleagle-Linux/pixeleagle-Linux.json results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/Linux-pixeleagle
-          # mv pixeleagle-Windows/pixeleagle-Windows.json results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/Windows-pixeleagle
+          mv pixeleagle-Windows/pixeleagle-Windows.json results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/Windows-pixeleagle
           mv pixeleagle-macOS/pixeleagle-macOS.json results/${{ needs.get-environment.outputs.date }}-${{ needs.get-environment.outputs.gitref }}/macOS-pixeleagle
 
       - name: Store results in git

diff --git a/.github/workflows/workflow-native.yml b/.github/workflows/workflow-native.yml
@@ -20,10 +20,6 @@ on:
       per_page:
         required: true
         type: string
-      platforms:
-        required: false
-        type: string
-        default: '["ubuntu-latest", "macos-14"]'
 
 jobs:
   split-pages:
@@ -52,7 +48,7 @@ jobs:
       SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
     strategy:
       matrix:
-        os: ${{ fromJSON(inputs.platforms) }}
+        os: [ubuntu-latest, windows-latest, macos-14]
         page: ${{ fromJSON(needs.split-pages.outputs.pages) }}
 
     steps:

diff --git a/templates/about.html b/templates/about.html
@@ -40,6 +40,7 @@ <h1 class="display-5 fw-bold text-body-emphasis">Bevy Example Tester</h1>
                 Supported:
                 <ul class="list-group">
                     <li class="list-group-item">Linux / Vulkan</li>
+                    <li class="list-group-item">Windows / DX12</li>
                     <li class="list-group-item">macOS / Metal</li>
                     <li class="list-group-item">iOS</li>
                     <li class="list-group-item">Android</li>
@@ -49,7 +50,6 @@ <h1 class="display-5 fw-bold text-body-emphasis">Bevy Example Tester</h1>
                 <ul class="list-group">
                     <li class="list-group-item">WebGL2</li>
                     <li class="list-group-item">WebGPU</li>
-                    <li class="list-group-item">Windows / DX12</li>
                 </ul>
             </div>
             <br />
@@ -124,6 +124,24 @@ <h1 class="display-5 fw-bold text-body-emphasis">Bevy Example Tester</h1>
                     </svg>
                 </div>
                 <p>Your all-in-one visual review platform.</p>
+                <a href="https://percy.io/dede4209/Screenshots-Linux-Vulkan" class="icon-link">
+                    Linux project
+                    <svg class="bi">
+                        <use xlink:href="#chevron-right"></use>
+                    </svg>
+                </a>
+                <a href="https://percy.io/dede4209/Screenshots-Windows-DX12" class="icon-link">
+                    Windows project
+                    <svg class="bi">
+                        <use xlink:href="#chevron-right"></use>
+                    </svg>
+                </a>
+                <a href="https://percy.io/dede4209/Screenshots-macOS-Metal" class="icon-link">
+                    macOS project
+                    <svg class="bi">
+                        <use xlink:href="#chevron-right"></use>
+                    </svg>
+                </a>
                 <a href="https://percy.io/dede4209/Bevy-Mobile-Example" class="icon-link">
                     Mobile project
                     <svg class="bi">

diff --git a/templates/index.html b/templates/index.html
@@ -313,19 +313,24 @@
             <tr {% if example.flaky -%}class="flaky" {% else -%}class="all-good" style="display: none;" {% endif -%}>
                 <td style="border-right: none;">{{ example.category }} / {{ example.name }}</td>
                 <td style="border-left: none;">
+                    <span class="windows"></span>
+                    <hr>
                     <span class="linux"></span>
                     <hr>
                     <span class="macos"></span>
                 </td>
                 {% for run in runs -%}
                 <td style="text-align: center;">
                     {% if run.results[example.name] -%}
+                    {{ macros::status(example_name=example.name, platform="Windows", run=run) }}
+                    <hr />
                     {{ macros::status(example_name=example.name, platform="Linux", run=run) }}
                     <hr />
                     {{ macros::status(example_name=example.name, platform="macOS", run=run) }}
                     {% else -%}
                     -
                     <hr />-
+                    <hr />-
                     {% endif -%}
                 </td>
                 {% endfor -%}
@@ -357,4 +362,4 @@
     </script>
 </body>
 
-</html>
+</html>