Merge branch 'main' into release-v15.2.1

.github/pull_request_template.md

@@ -2,11 +2,9 @@
 ### Test Plan:
 
 <!--
-  How did you validate that your changes were implemented correctly?
+  How did you validate that your changes were implemented correctly? If manually test, how?
 -->
 
-- [ ] Wrote [automated tests](https://czi.atlassian.net/wiki/x/Hbl1H)
+- [ ] Wrote/updated [automated tests](https://czi.atlassian.net/wiki/x/Hbl1H)
 - [ ] CI tests / new tests are not applicable
-- [ ] Manually tested my changes, but I want to keep the details secret
-- [ ] Created and used an [alpha publish](https://github.com/chanzuckerberg/edu-design-system/blob/main/docs/PUBLISHING.md#alpha-release)
 - [ ] Manually tested my changes, and here are the details:

.github/workflows/test.yml

@@ -123,7 +123,7 @@ jobs:
         # This workflow can also be triggered via "workflow_call".
         # Since it's a push event we have access to these properties https://docs.github.com/en/webhooks/webhook-events-and-payloads#push
         # Filtering on just the (required) .id https://docs.github.com/en/actions/learn-github-actions/expressions#object-filters
-        if: github.event_name == 'push'
+        if: github.event_name == 'push' && github.ref != 'refs/head/main'
         run: |
           COMMIT_COUNT=$(echo '${{ toJSON(github.event.commits.*.id) }}' | jq length)
           echo "Number of commits in the push: $COMMIT_COUNT"