From 4ed12dd5d99d4f4849074f65382a3de58621feb2 Mon Sep 17 00:00:00 2001 From: Adrian Ruiz <111095677+adrianrrruiz@users.noreply.github.com> Date: Sun, 2 Nov 2025 16:54:42 -0500 Subject: [PATCH 1/6] Refactor PR validation workflow for formatting checks --- .github/workflows/PRValidation.yml | 58 ++++++++++++++++++------------ 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/.github/workflows/PRValidation.yml b/.github/workflows/PRValidation.yml index 7a5a816..0a7b6f6 100644 --- a/.github/workflows/PRValidation.yml +++ b/.github/workflows/PRValidation.yml @@ -12,38 +12,37 @@ permissions: contents: write jobs: - format: + pr-check: runs-on: ubuntu-latest + steps: - name: Checkout code uses: actions/checkout@v4 - with: - ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }} - + - name: Setup Bun uses: oven-sh/setup-bun@v2.0.2 - name: Install dependencies run: bun install - - name: Run formatter - run: bun run format - - - name: Commit changes - if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref != 'develop' }} - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Apply formatting changes - file_pattern: 'src/**' - branch: ${{ github.event.pull_request.head.ref }} - - pr-check: - needs: format + - name: Set environment variables + run: | + echo "SUPABASE_URL=${{ secrets.SUPABASE_URL }}" >> $GITHUB_ENV + echo "SUPABASE_ANON_KEY=${{ secrets.SUPABASE_ANON_KEY }}" >> $GITHUB_ENV + + - name: Run build + run: bun run build + + format: + needs: pr-check runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v4 + with: + # Si esto es un PR, checkoutea la rama del PR; sino usa la ref normal (workflow_dispatch / push) + ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }} - name: Setup Bun uses: oven-sh/setup-bun@v2.0.2 @@ -51,10 +50,25 @@ jobs: - name: Install dependencies run: bun install - - name: Set environment variables + - name: Check formatting + id: fmt-check run: | - echo "SUPABASE_URL=${{ secrets.SUPABASE_URL }}" >> $GITHUB_ENV - echo "SUPABASE_ANON_KEY=${{ secrets.SUPABASE_ANON_KEY }}" >> $GITHUB_ENV + # Intentamos hacer un "check" del formateador; si está bien, devolvemos formatted=true + # Si el check falla, devolvemos formatted=false para ejecutar el formatter luego. + if bun run format -- --check; then + echo "formatted=true" >> $GITHUB_OUTPUT + else + echo "formatted=false" >> $GITHUB_OUTPUT + fi - - name: Run build - run: bun run build + - name: Run formatter (only if needed) + if: ${{ steps.fmt-check.outputs.formatted == 'false' }} + run: bun run format + + - name: Commit formatting changes + if: ${{ github.event_name == 'pull_request' && steps.fmt-check.outputs.formatted == 'false' && github.event.pull_request.head.ref != 'develop' }} + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: Apply formatting changes + file_pattern: 'src/**' + branch: ${{ github.event.pull_request.head.ref }} From ddd494e22eb75782ca7c23011409cad6f07e7aaa Mon Sep 17 00:00:00 2001 From: Adrian Ruiz Date: Sun, 2 Nov 2025 16:59:35 -0500 Subject: [PATCH 2/6] Test: formatting --- src/components/league/sections/upcoming-events.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/league/sections/upcoming-events.tsx b/src/components/league/sections/upcoming-events.tsx index 945eb88..f0b1be9 100644 --- a/src/components/league/sections/upcoming-events.tsx +++ b/src/components/league/sections/upcoming-events.tsx @@ -4,14 +4,15 @@ import { Carousel } from "@/components/home/apple-cards-carousel"; import EventCard from "@/components/league/ui/Events/event-card"; import { Contest } from "@/models/contest.model"; import { LevelEnum } from "@/models/level.enum"; -import { ReactNode, useEffect, useState } from "react"; +import { + ReactNode, + useEffect, + useState, + memo +} from "react"; import { LevelFilter } from "../ui/Events/level-filter"; -const formatDateEvent = ({ - date, - start_hour, - final_hour, -}: { +const formatDateEvent = ({ date, start_hour, final_hour, }: { date: Date; start_hour: Date; final_hour: Date; From 1153e283f2a30ec201e0a75b41137e3d3507e15f Mon Sep 17 00:00:00 2001 From: Adrian Ruiz Date: Sun, 2 Nov 2025 17:01:46 -0500 Subject: [PATCH 3/6] Test: formatting --- src/components/league/sections/upcoming-events.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/league/sections/upcoming-events.tsx b/src/components/league/sections/upcoming-events.tsx index f0b1be9..06ce6d8 100644 --- a/src/components/league/sections/upcoming-events.tsx +++ b/src/components/league/sections/upcoming-events.tsx @@ -7,8 +7,7 @@ import { LevelEnum } from "@/models/level.enum"; import { ReactNode, useEffect, - useState, - memo + useState } from "react"; import { LevelFilter } from "../ui/Events/level-filter"; From 79324ed951da8aa9879ed1522f2d5303328563be Mon Sep 17 00:00:00 2001 From: Adrian Ruiz Date: Sun, 2 Nov 2025 17:06:05 -0500 Subject: [PATCH 4/6] Test: formatting --- src/components/league/sections/upcoming-events.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/league/sections/upcoming-events.tsx b/src/components/league/sections/upcoming-events.tsx index 06ce6d8..8df02fe 100644 --- a/src/components/league/sections/upcoming-events.tsx +++ b/src/components/league/sections/upcoming-events.tsx @@ -6,12 +6,17 @@ import { Contest } from "@/models/contest.model"; import { LevelEnum } from "@/models/level.enum"; import { ReactNode, + + + + useEffect, useState } from "react"; import { LevelFilter } from "../ui/Events/level-filter"; -const formatDateEvent = ({ date, start_hour, final_hour, }: { +const formatDateEvent = ({ date, + start_hour, final_hour, }: { date: Date; start_hour: Date; final_hour: Date; @@ -56,7 +61,7 @@ export function UpcomingEvents({ className="justify-end !w-[20rem] xl:!w-[30rem]" >
- From 3bb43c64ab71904341f5e8bed2e693f920af5c92 Mon Sep 17 00:00:00 2001 From: Adrian Ruiz <111095677+adrianrrruiz@users.noreply.github.com> Date: Sun, 2 Nov 2025 17:16:45 -0500 Subject: [PATCH 5/6] Change formatting check command to use Prettier --- .github/workflows/PRValidation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/PRValidation.yml b/.github/workflows/PRValidation.yml index 0a7b6f6..88a316a 100644 --- a/.github/workflows/PRValidation.yml +++ b/.github/workflows/PRValidation.yml @@ -55,7 +55,7 @@ jobs: run: | # Intentamos hacer un "check" del formateador; si está bien, devolvemos formatted=true # Si el check falla, devolvemos formatted=false para ejecutar el formatter luego. - if bun run format -- --check; then + if bun run prettier . --check; then echo "formatted=true" >> $GITHUB_OUTPUT else echo "formatted=false" >> $GITHUB_OUTPUT From 24d2d56fd74565d5d16525f6d0b8a5aa975506e3 Mon Sep 17 00:00:00 2001 From: adrianrrruiz Date: Sun, 2 Nov 2025 22:18:09 +0000 Subject: [PATCH 6/6] Apply formatting changes --- .../league/sections/upcoming-events.tsx | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/components/league/sections/upcoming-events.tsx b/src/components/league/sections/upcoming-events.tsx index 8df02fe..945eb88 100644 --- a/src/components/league/sections/upcoming-events.tsx +++ b/src/components/league/sections/upcoming-events.tsx @@ -4,19 +4,14 @@ import { Carousel } from "@/components/home/apple-cards-carousel"; import EventCard from "@/components/league/ui/Events/event-card"; import { Contest } from "@/models/contest.model"; import { LevelEnum } from "@/models/level.enum"; -import { - ReactNode, - - - - - useEffect, - useState -} from "react"; +import { ReactNode, useEffect, useState } from "react"; import { LevelFilter } from "../ui/Events/level-filter"; -const formatDateEvent = ({ date, - start_hour, final_hour, }: { +const formatDateEvent = ({ + date, + start_hour, + final_hour, +}: { date: Date; start_hour: Date; final_hour: Date; @@ -61,7 +56,7 @@ export function UpcomingEvents({ className="justify-end !w-[20rem] xl:!w-[30rem]" >
-