Merge branch 'main' into ducky-bober-emoji

Author: mbaruh

.github/workflows/event-validation.yml

@@ -14,12 +14,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
 
       - name: Install dependencies
         run: python -m pip install -r events/requirements.txt
@@ -46,7 +46,7 @@ jobs:
       - name: Upload a Build Artifact
         if: always() && steps.prepare-artifact.outcome == 'success'
         continue-on-error: true
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: pull-request-payload
           path: pull_request_payload.json

.github/workflows/status-embed.yml

@@ -7,24 +7,12 @@ on:
     types:
       - completed
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   status_embed:
-    # We need to send a status embed whenever the workflow
-    # sequence we're running terminates. There are a number
-    # of situations in which that happens:
-    #
-    # 1. We reach the end of the Event Validation workflow, without
-    #    it being skipped.
-    #
-    # 2. A `pull_request` triggered a Lint & Test workflow,
-    #    as the sequence always terminates with one run.
-    #
-    # 3. If any workflow ends in failure or was cancelled.
-    if: >-
-      (github.event.workflow_run.name == 'Event Validation' && github.event.workflow_run.conclusion != 'skipped') ||
-      github.event.workflow_run.event == 'pull_request' ||
-      github.event.workflow_run.conclusion == 'failure' ||
-      github.event.workflow_run.conclusion == 'cancelled'
     name:  Send Status Embed to Discord
     runs-on: ubuntu-latest
 
@@ -39,13 +27,13 @@ jobs:
           curl -s -H "Authorization: token $GITHUB_TOKEN" ${{ github.event.workflow_run.artifacts_url }} > artifacts.json
           DOWNLOAD_URL=$(cat artifacts.json | jq -r '.artifacts[] | select(.name == "pull-request-payload") | .archive_download_url')
           [ -z "$DOWNLOAD_URL" ] && exit 1
-          wget --quiet --header="Authorization: token $GITHUB_TOKEN" -O pull_request_payload.zip $DOWNLOAD_URL || exit 2
+          curl -sSL -H "Authorization: token $GITHUB_TOKEN" -o pull_request_payload.zip $DOWNLOAD_URL || exit 2
           unzip -p pull_request_payload.zip > pull_request_payload.json
           [ -s pull_request_payload.json ] || exit 3
-          echo "::set-output name=pr_author_login::$(jq -r '.user.login // empty' pull_request_payload.json)"
-          echo "::set-output name=pr_number::$(jq -r '.number // empty' pull_request_payload.json)"
-          echo "::set-output name=pr_title::$(jq -r '.title // empty' pull_request_payload.json)"
-          echo "::set-output name=pr_source::$(jq -r '.head.label // empty' pull_request_payload.json)"
+          echo "pr_author_login=$(jq -r '.user.login // empty' pull_request_payload.json)" >> $GITHUB_OUTPUT
+          echo "pr_number=$(jq -r '.number // empty' pull_request_payload.json)" >> $GITHUB_OUTPUT
+          echo "pr_title=$(jq -r '.title // empty' pull_request_payload.json)" >> $GITHUB_OUTPUT
+          echo "pr_source=$(jq -r '.head.label // empty' pull_request_payload.json)" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -54,20 +42,18 @@ jobs:
       # more information and we can fine tune when we actually want
       # to send an embed.
       - name: GitHub Actions Status Embed for Discord
-        uses: SebastiaanZ/github-status-embed-for-discord@v0.2.1
+        uses: SebastiaanZ/github-status-embed-for-discord@v0.3.0
         with:
           # Our GitHub Actions webhook
           webhook_id: '784184528997842985'
           webhook_token: ${{ secrets.GHA_WEBHOOK_TOKEN }}
 
-          # Workflow information
+          # We need to provide the information of the workflow that
+          # triggered this workflow instead of this workflow.
           workflow_name: ${{ github.event.workflow_run.name }}
           run_id: ${{ github.event.workflow_run.id }}
           run_number: ${{ github.event.workflow_run.run_number }}
           status: ${{ github.event.workflow_run.conclusion }}
-          actor: ${{ github.actor }}
-          repository:  ${{ github.repository }}
-          ref: ${{ github.ref }}
           sha: ${{ github.event.workflow_run.head_sha }}
 
           pr_author_login: ${{ steps.pr_info.outputs.pr_author_login }}

emotes/lemoji/dist/lemoji_pleading.png

@@ -23,7 +23,7 @@ start_date: July 10
 end_date: July 20
 ```
 
-There must be exactly 1 fallback event, and 0 or more non-fallback events. Events cannot collide in time, and the end date must either be equal to the start date (1 day event) or chronologically subsequent. Both bounds are inclusive, and the format shown in the example above must be followed.
+There must be exactly 1 fallback event, and 0 or more non-fallback events. For single-day events, `end_date` must be equal to `start_date`. If `start_date` is a later day in the year than `end_date`, the event is interpreted as starting in one year and ending in the next. Both bounds are inclusive, and the format shown in the example above must be followed.
 
 The markdown section of the meta file then contains the event's description. Descriptions are made available directly in the Discord guild as embeds sent by the Python bot. For formatting, use Discord's watered down Markdown ~ keep in mind that e.g. the `#` symbol does not create a heading.
 

emotes/lemoji/src/lemoji_pleading.svg

@@ -1,6 +1,6 @@
 ---
-start_date: November 8
-end_date: November 14
+start_date: November 1
+end_date: November 4
 ---
 **Diwali**
 

events/README.md

@@ -1,6 +1,6 @@
 ---
-start_date: April 3
-end_date: April 10
+start_date: March 30
+end_date: April 1
 ---
 **Easter**
 

events/diwali/meta.md

@@ -1,6 +1,6 @@
 ---
-start_date: April 20
-end_date: April 21
+start_date: April 9
+end_date: April 13
 ---
 
 **Eid al-Fitr**

events/easter/meta.md

@@ -1,6 +1,6 @@
 ---
-start_date: October 26
-end_date: November 1
+start_date: October 30
+end_date: October 31
 ---
 **Halloween**
 

events/eid_al_fitr/meta.md

@@ -1,6 +1,6 @@
 ---
-start_date: March 7
-end_date: March 13
+start_date: March 23
+end_date: March 26
 ---
 **Holi**
 

events/halloween/meta.md

@@ -1,6 +1,6 @@
 ---
-start_date: December 26
-end_date: December 31
+start_date: December 29
+end_date: January 3
 ---
 **New Year**
 

events/holi/meta.md

@@ -1,3 +1,3 @@
-# Python: 3.8
-python-frontmatter==1.0.0
-pyyaml==5.4.1
+# Python: 3.12
+python-frontmatter==1.1.0
+pyyaml==6.0.1

events/new_year/meta.md

@@ -9,7 +9,6 @@
 We check that each event directory satisfies the following:
 * Contains 'meta.md', `banners/` and 'server_icons/' with at least 1 file inside each
 * The 'meta.md' file either registers the event as fallback, or specifies the start and end dates
-* The end date must either be the same as the start date, or chronologically subsequent
 * The 'meta.md' file contains an event description between 1 and 2048 characters in length
 
 If all events are set up correctly, we also validate that:
@@ -123,8 +122,6 @@ def make_event(name: str, from_dir: Path) -> Event:
     except Exception as exc:
         raise Misconfiguration(f"Attribute 'end_date' with value '{end_date}' failed to parse: {exc}")
 
-    if not start_date <= end_date:
-        raise Misconfiguration("End date must be equal or subsequent to start date")
 
     return Event(name=name, fallback=False, start_date=start_date, end_date=end_date, description=description)
 
@@ -133,20 +130,21 @@ def active_days(event: Event) -> t.Iterator[date]:
     """
     Generate all days in which `event` is active.
 
+    All dates returned will be in the same year.
+
     This can only be called for non-fallback events. The fallback event does not have start and end dates.
     """
     if None in (event.start_date, event.end_date):
         raise RuntimeError("Cannot generate days: event does not have start and date!")
 
-    if not event.start_date <= event.end_date:
-        raise RuntimeError("Cannot generate days: start date does not precede end date!")
-
     state = event.start_date
     while True:
         yield state
         if state == event.end_date:
             break
         state += timedelta(days=1)
+        # Wrap around to the same year, so comparisons only compare day and month.
+        state = state.replace(year=ARBITRARY_YEAR)
 
 
 def find_collisions(events: t.List[Event]) -> t.Dict[date, t.List[Event]]: