From d2be7aef0fd21c8306772cc58b524d96296546ab Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2026 02:49:11 +0000 Subject: [PATCH 1/2] Move Blog to its own top-level nav tab Co-Authored-By: golden --- .../blog/2025-02-24_preparing-for-math-competitions.md | 2 +- .../{resources => }/blog/2025-04-01_starting-a-math-club.md | 2 +- .../blog/2025-04-11_bmmt-tournament-day-tips.md | 2 +- .../blog/2025-11-07_bmt-power-round-guidance.md | 2 +- .../blog/2026-04-06_bmmt-puzzle-round-guidance.md | 2 +- content/{resources => }/blog/_index.md | 2 +- templates/base.html | 2 ++ templates/resources/index.html | 4 +--- 8 files changed, 9 insertions(+), 9 deletions(-) rename content/{resources => }/blog/2025-02-24_preparing-for-math-competitions.md (98%) rename content/{resources => }/blog/2025-04-01_starting-a-math-club.md (99%) rename content/{resources => }/blog/2025-04-11_bmmt-tournament-day-tips.md (98%) rename content/{resources => }/blog/2025-11-07_bmt-power-round-guidance.md (98%) rename content/{resources => }/blog/2026-04-06_bmmt-puzzle-round-guidance.md (98%) rename content/{resources => }/blog/_index.md (57%) diff --git a/content/resources/blog/2025-02-24_preparing-for-math-competitions.md b/content/blog/2025-02-24_preparing-for-math-competitions.md similarity index 98% rename from content/resources/blog/2025-02-24_preparing-for-math-competitions.md rename to content/blog/2025-02-24_preparing-for-math-competitions.md index 8cf0d0d..a0e15c2 100644 --- a/content/resources/blog/2025-02-24_preparing-for-math-competitions.md +++ b/content/blog/2025-02-24_preparing-for-math-competitions.md @@ -1,6 +1,6 @@ +++ title = "Approaching and Preparing for Math Competitions" -aliases = ["/blog/preparing-for-math-competitions"] +aliases = ["/resources/blog/preparing-for-math-competitions"] authors = ["Danielle Murphy"] [taxonomies] diff --git a/content/resources/blog/2025-04-01_starting-a-math-club.md b/content/blog/2025-04-01_starting-a-math-club.md similarity index 99% rename from content/resources/blog/2025-04-01_starting-a-math-club.md rename to content/blog/2025-04-01_starting-a-math-club.md index 3de1f9f..145ce60 100644 --- a/content/resources/blog/2025-04-01_starting-a-math-club.md +++ b/content/blog/2025-04-01_starting-a-math-club.md @@ -1,6 +1,6 @@ +++ title = "Starting a Math Club" -aliases = ["/blog/starting-a-math-club"] +aliases = ["/resources/blog/starting-a-math-club"] authors = ["Nathan Alejandria, Claire Foster, Carlyana Kwong"] [taxonomies] diff --git a/content/resources/blog/2025-04-11_bmmt-tournament-day-tips.md b/content/blog/2025-04-11_bmmt-tournament-day-tips.md similarity index 98% rename from content/resources/blog/2025-04-11_bmmt-tournament-day-tips.md rename to content/blog/2025-04-11_bmmt-tournament-day-tips.md index 88c2873..52a3022 100644 --- a/content/resources/blog/2025-04-11_bmmt-tournament-day-tips.md +++ b/content/blog/2025-04-11_bmmt-tournament-day-tips.md @@ -1,6 +1,6 @@ +++ title = "How to get the most out of BmMT" -aliases = ["/blog/bmmt-tournament-day-tips"] +aliases = ["/resources/blog/bmmt-tournament-day-tips"] authors = ["BMT Team"] [taxonomies] diff --git a/content/resources/blog/2025-11-07_bmt-power-round-guidance.md b/content/blog/2025-11-07_bmt-power-round-guidance.md similarity index 98% rename from content/resources/blog/2025-11-07_bmt-power-round-guidance.md rename to content/blog/2025-11-07_bmt-power-round-guidance.md index f68b2d7..860f6fd 100644 --- a/content/resources/blog/2025-11-07_bmt-power-round-guidance.md +++ b/content/blog/2025-11-07_bmt-power-round-guidance.md @@ -1,6 +1,6 @@ +++ title = "BMT Power Round Guidance" -aliases = ["/blog/bmt-power-round-guidance"] +aliases = ["/resources/blog/bmt-power-round-guidance"] authors = ["Kiran Parthasarathy, Theodore Danial, Andrew Huang"] [taxonomies] diff --git a/content/resources/blog/2026-04-06_bmmt-puzzle-round-guidance.md b/content/blog/2026-04-06_bmmt-puzzle-round-guidance.md similarity index 98% rename from content/resources/blog/2026-04-06_bmmt-puzzle-round-guidance.md rename to content/blog/2026-04-06_bmmt-puzzle-round-guidance.md index c32ea54..6d0d94a 100644 --- a/content/resources/blog/2026-04-06_bmmt-puzzle-round-guidance.md +++ b/content/blog/2026-04-06_bmmt-puzzle-round-guidance.md @@ -1,6 +1,6 @@ +++ title = "BmMT Puzzle Round Guidance" -aliases = ["/blog/bmmt-puzzle-round-guidance"] +aliases = ["/resources/blog/bmmt-puzzle-round-guidance"] authors = ["BmMT Team"] [taxonomies] diff --git a/content/resources/blog/_index.md b/content/blog/_index.md similarity index 57% rename from content/resources/blog/_index.md rename to content/blog/_index.md index c5be4c5..5836872 100644 --- a/content/resources/blog/_index.md +++ b/content/blog/_index.md @@ -1,5 +1,5 @@ +++ title = "Blog" sort_by = "date" -aliases = ["/blog"] +aliases = ["/resources/blog"] +++ diff --git a/templates/base.html b/templates/base.html index 3716b32..0cae943 100644 --- a/templates/base.html +++ b/templates/base.html @@ -87,6 +87,7 @@ {{ macros::mobile_nav_link(path="@/about.md", label="About") }} {{ macros::mobile_nav_link(path="@/archives/_index.md", label="Archives") }} {{ macros::mobile_nav_link(path="@/resources/index.md", label="Resources") }} + {{ macros::mobile_nav_link(path="@/blog/_index.md", label="Blog") }} {{ macros::mobile_nav_link(path="@/events/bmt-2026.md", label="BMT 2026") }} {{ macros::mobile_nav_link(path="@/events/bmt-2026-online.md", label="BMT 2026 Online") }} {{ macros::mobile_nav_link(path="@/faqs.md", label="FAQ") }} @@ -107,6 +108,7 @@ {{ macros::nav_link(path="@/about.md", label="About") }} {{ macros::nav_link(path="@/archives/_index.md", label="Archives") }} {{ macros::nav_link(path="@/resources/index.md", label="Resources") }} + {{ macros::nav_link(path="@/blog/_index.md", label="Blog") }} {{ macros::nav_link(path="@/events/bmt-2026.md", label="BMT 2026") }} {{ macros::nav_link(path="@/events/bmt-2026-online.md", label="BMT 2026 Online") }} {{ macros::nav_link(path="@/faqs.md", label="FAQ") }} diff --git a/templates/resources/index.html b/templates/resources/index.html index ce12d2b..7eab32e 100644 --- a/templates/resources/index.html +++ b/templates/resources/index.html @@ -4,18 +4,16 @@ {% block after_page_content %} -{# Spring (Jan–Jun): BmMT worksheets first for BmMT season; rest of the year: blog first for BMT season #} +{# Spring (Jan–Jun): BmMT worksheets first for BmMT season; rest of the year: BMT prep first #} {% set month = now() | date(format="%m") | int %} {% if month <= 6 %} {% set sections = [ get_section(path="resources/bmmt-worksheets/_index.md"), get_section(path="resources/bmt-to-aime/_index.md"), - get_section(path="resources/blog/_index.md"), ] %} {% else %} {% set sections = [ - get_section(path="resources/blog/_index.md"), get_section(path="resources/bmt-to-aime/_index.md"), get_section(path="resources/bmmt-worksheets/_index.md"), ] %} From 505058c93074126316848bb31c56cab80bf9fe13 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2026 02:52:34 +0000 Subject: [PATCH 2/2] ci: replace removed cloudflare/pages-action with wrangler-action Co-Authored-By: golden --- .github/workflows/deploy-preview.yaml | 6 ++---- .github/workflows/deploy.yaml | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy-preview.yaml b/.github/workflows/deploy-preview.yaml index 3e9380c..21756da 100644 --- a/.github/workflows/deploy-preview.yaml +++ b/.github/workflows/deploy-preview.yaml @@ -43,10 +43,8 @@ jobs: name: result - name: Deploy to Cloudflare Pages - uses: cloudflare/pages-action@v1 + uses: cloudflare/wrangler-action@v3 with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: 44d0498f26e72b3e24b3ba9d152ca879 - projectName: berkeley-mt - branch: pr-${{ github.event.number }} - directory: . + command: pages deploy . --project-name=berkeley-mt --branch=pr-${{ github.event.number }} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 771f6bb..d29a7f2 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -62,9 +62,8 @@ jobs: name: result - name: Deploy to Cloudflare Pages - uses: cloudflare/pages-action@v1 + uses: cloudflare/wrangler-action@v3 with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: 44d0498f26e72b3e24b3ba9d152ca879 - projectName: berkeley-mt - directory: . + command: pages deploy . --project-name=berkeley-mt