From 2a384ae6ba6fcfdcb88f81936ce7ea7860fd977f Mon Sep 17 00:00:00 2001 From: Seth Cottle Date: Mon, 17 Mar 2025 18:51:05 -0400 Subject: [PATCH] Update contrast-check.yml --- .github/workflows/contrast-check.yml | 45 ++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/.github/workflows/contrast-check.yml b/.github/workflows/contrast-check.yml index cb1edef5..6a395029 100644 --- a/.github/workflows/contrast-check.yml +++ b/.github/workflows/contrast-check.yml @@ -15,18 +15,39 @@ jobs: - name: Checkout code uses: actions/checkout@v3 with: - fetch-depth: 0 + fetch-depth: 0 # Fetch all history - - name: Fetch main branch - run: git fetch origin main:main - - - name: Debug information - run: | - echo "Current branch: $(git branch --show-current)" - echo "Modified files in PR:" - git diff --name-only origin/main - - - name: Run Contrast Check + - name: Setup for contrast check run: | + # For PR, fetch the base branch + if [[ "${{ github.event_name }}" == "pull_request" ]]; then + echo "Running on PR from ${{ github.head_ref }} to ${{ github.base_ref }}" + git fetch origin ${{ github.base_ref }}:${{ github.base_ref }} + echo "BASE_BRANCH=origin/${{ github.base_ref }}" >> $GITHUB_ENV + else + # For push or manual, use the default branch + echo "Running on push or manual trigger" + echo "BASE_BRANCH=HEAD~1" >> $GITHUB_ENV + fi + + # Make script executable chmod +x ./scripts/audit-contrast.sh - ./scripts/audit-contrast.sh + + - name: Modify contrast check script + run: | + # Create a temporary version of the script with the correct reference + grep -v "new_css=" ./scripts/audit-contrast.sh > temp.sh + + # Add the corrected git diff command + echo "# ---- FIXED GIT DIFF HANDLING ----" >> temp.sh + echo "new_css=\$(git diff $BASE_BRANCH --unified=0 -- css/brands.css | awk '/^\+.*(--button-text|--button-background|--button-border|background-image|\/\*|\.button-)/)" >> temp.sh + + # Add the rest of the original script + grep -A 1000 "if \[\[ -z \"\$new_css\" \]\]; then" ./scripts/audit-contrast.sh >> temp.sh + + # Replace the original script + mv temp.sh ./scripts/audit-contrast.sh + chmod +x ./scripts/audit-contrast.sh + + - name: Run Contrast Check + run: ./scripts/audit-contrast.sh