diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index aeaecd72df2..79ddf2c65f7 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -213,40 +213,40 @@ jobs: steps: - run: echo Alternate tests passed. - # compare_screenshots: - # if: "!contains(github.event.head_commit.message, '[ci skip]') && always()" - # needs: [run_all_tests, run_alternate_tests] - # name: Compare Screenshot Tests - # runs-on: ubuntu-20.04 - # steps: - # - uses: actions/checkout@v3 - # # If we ever add more artifacts, this is going to break, but it'll be obvious. - # - name: Download screenshot tests - # uses: actions/download-artifact@v3 - # with: - # path: artifacts - # - name: ls -R - # run: ls -R artifacts - # - name: Setup screenshot comparison - # run: npm i - # working-directory: tools/screenshot-test-comparison - # - name: Run screenshot comparison - # run: node tools/screenshot-test-comparison/index.js artifacts code/modules/unit_tests/screenshots artifacts/screenshot_comparisons - # # workflow_run does not give you the PR it ran on, - # # even through the thing literally named "matching pull requests". - # # However, in GraphQL, you can check if the check suite was ran - # # by a specific PR, so trusting the (user controlled) action here is okay, - # # as long as we check it later in show_screenshot_test_results - # - name: Save PR ID - # if: failure() && github.event.pull_request - # run: | - # echo ${{ github.event.pull_request.number }} > artifacts/screenshot_comparisons/pull_request_number.txt - # - name: Upload bad screenshots - # if: failure() - # uses: actions/upload-artifact@v3 - # with: - # name: bad-screenshots - # path: artifacts/screenshot_comparisons + compare_screenshots: + if: "!contains(github.event.head_commit.message, '[ci skip]') && always()" + needs: [run_all_tests, run_alternate_tests] + name: Compare Screenshot Tests + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + # If we ever add more artifacts, this is going to break, but it'll be obvious. + - name: Download screenshot tests + uses: actions/download-artifact@v3 + with: + path: artifacts + - name: ls -R + run: ls -R artifacts + - name: Setup screenshot comparison + run: npm i + working-directory: tools/screenshot-test-comparison + - name: Run screenshot comparison + run: node tools/screenshot-test-comparison/index.js artifacts code/modules/unit_tests/screenshots artifacts/screenshot_comparisons + # workflow_run does not give you the PR it ran on, + # even through the thing literally named "matching pull requests". + # However, in GraphQL, you can check if the check suite was ran + # by a specific PR, so trusting the (user controlled) action here is okay, + # as long as we check it later in show_screenshot_test_results + - name: Save PR ID + if: failure() && github.event.pull_request + run: | + echo ${{ github.event.pull_request.number }} > artifacts/screenshot_comparisons/pull_request_number.txt + - name: Upload bad screenshots + if: failure() + uses: actions/upload-artifact@v3 + with: + name: bad-screenshots + path: artifacts/screenshot_comparisons test_windows: if: ( !contains(github.event.head_commit.message, '[ci skip]') ) diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png index e53e0a86697..8e5cb6076ea 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_abductor_lesser.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_abductor_lesser.png new file mode 100644 index 00000000000..1ad767d2b64 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_abductor_lesser.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png index e487c3a80bd..da1219f9949 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png index 8ebd5b8eea2..b9ef0c30658 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png index 8ebd5b8eea2..b9ef0c30658 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png index f2aa05b5a1b..78c2cd7d1dc 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mammal_shadekin.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mammal_shadekin.png deleted file mode 100644 index f12eed7031f..00000000000 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mammal_shadekin.png and /dev/null differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png index 0ffa32ed58b..986a5b8cbe8 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png index cc3adf85bc3..2224c3bdab9 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skrell.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skrell.png index 4e90a6e43ca..5126b145370 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skrell.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skrell.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_tajaran.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_tajaran.png index f42abc57a45..5e8c6416918 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_tajaran.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_tajaran.png differ