diff --git a/.github/workflows/report-main.yml b/.github/workflows/report-main.yml index 37a1b8e1..2a55874c 100644 --- 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 index 56ea4808..957618f3 100644 --- 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 index bb61f96e..cd8879c9 100644 --- a/templates/about.html +++ b/templates/about.html @@ -40,6 +40,7 @@

Bevy Example Tester

Supported: