Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .circleci/post-coverage-comment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
## GITHUB_TOKEN - GitHub token for API access.
## CIRCLE_PROJECT_USERNAME - GitHub org/user.
## CIRCLE_PROJECT_REPONAME - GitHub repo name.
## VORTEX_CI_CODE_COVERAGE_THRESHOLD - Coverage threshold percentage (default: 90).
##
## Usage:
## .circleci/post-coverage-comment.sh /path/to/coverage.txt
Expand All @@ -32,16 +33,25 @@ if [ -z "${GITHUB_TOKEN:-}" ]; then
exit 0
fi

COVERAGE_CONTENT=$(sed '/./,$!d' "${COVERAGE_FILE}")
COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' "${COVERAGE_FILE}")
COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' "${COVERAGE_FILE}")
Comment on lines +36 to +37

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Whitespace-only separator lines can break summary/details splitting.

On Line 36 and Line 37, ^$ only matches completely empty lines. If the separator line contains spaces, COVERAGE_SUMMARY may absorb details and COVERAGE_DETAILS may be wrong.

💡 Suggested hardening
-COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' "${COVERAGE_FILE}")
-COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' "${COVERAGE_FILE}")
+COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^[[:space:]]*$/{exit} f' "${COVERAGE_FILE}")
+COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^[[:space:]]*$/{s=2;next} s==2' "${COVERAGE_FILE}")
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' "${COVERAGE_FILE}")
COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' "${COVERAGE_FILE}")
COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^[[:space:]]*$/{exit} f' "${COVERAGE_FILE}")
COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^[[:space:]]*$/{s=2;next} s==2' "${COVERAGE_FILE}")
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In @.circleci/post-coverage-comment.sh around lines 36 - 37, The current awk
splits use a strict empty-line match /^$/ which fails if the separator line
contains spaces; update both COVERAGE_SUMMARY and COVERAGE_DETAILS patterns to
treat separator lines as whitespace-only by replacing the /^$/ tests with a
whitespace-aware regex such as /^[[:space:]]*$/ (or an equivalent POSIX-safe
pattern) so the summary/details extraction logic still stops/starts correctly
even when the separator contains spaces.

PR_NUMBER=$(echo "${CIRCLE_PULL_REQUEST}" | cut -d'/' -f 7)
REPO_SLUG="${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}"
THRESHOLD="${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}"

MARKER="<!-- coverage-circleci -->"

BODY=$(jq -n --arg body "**Code coverage (CircleCI)**
BODY=$(jq -n --arg body "**Code coverage** (threshold: ${THRESHOLD}%)
\`\`\`
${COVERAGE_CONTENT}
${COVERAGE_SUMMARY}
\`\`\`
<details>
<summary>Per-class coverage</summary>

\`\`\`
${COVERAGE_DETAILS}
\`\`\`
</details>
${MARKER}" '{body: $body}')

# Minimize previous coverage comments.
Expand Down
22 changes: 18 additions & 4 deletions .github/workflows/build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,15 @@ jobs:
RATE=$(grep -om1 'line-rate="[0-9.]*"' .logs/coverage/phpunit/cobertura.xml | tr -cd '0-9.')
PERCENT=$(awk "BEGIN {printf \"%.2f\", $RATE*100}")
echo "Coverage: $PERCENT% (threshold: $VORTEX_CI_CODE_COVERAGE_THRESHOLD%)" | tee -a "$GITHUB_STEP_SUMMARY"
echo "COVERAGE_PERCENT=${PERCENT}" >> "$GITHUB_ENV"
{ echo "COVERAGE_CONTENT<<EOF"; sed '/./,$!d' .logs/coverage/phpunit/coverage.txt; echo "EOF"; } >> "$GITHUB_ENV"
{
echo "COVERAGE_PERCENT=${PERCENT}"
echo "COVERAGE_SUMMARY<<EOF"
awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' .logs/coverage/phpunit/coverage.txt
echo "EOF"
echo "COVERAGE_DETAILS<<EOF"
awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' .logs/coverage/phpunit/coverage.txt
echo "EOF"
} >> "$GITHUB_ENV"
env:
VORTEX_CI_CODE_COVERAGE_THRESHOLD: ${{ vars.VORTEX_CI_CODE_COVERAGE_THRESHOLD || '90' }}

Expand All @@ -444,10 +451,17 @@ jobs:
with:
header: coverage-gha
message: |
**Code coverage (GitHub Actions)**
**Code coverage** (threshold: ${{ vars.VORTEX_CI_CODE_COVERAGE_THRESHOLD || '90' }}%)
```
${{ env.COVERAGE_CONTENT }}
${{ env.COVERAGE_SUMMARY }}
```
<details>
<summary>Per-class coverage</summary>

```
${{ env.COVERAGE_DETAILS }}
```
</details>
hide_and_recreate: true

- name: Upload coverage report to Codecov
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,15 @@ jobs:
RATE=$(grep -om1 'line-rate="[0-9.]*"' .logs/coverage/phpunit/cobertura.xml | tr -cd '0-9.')
PERCENT=$(awk "BEGIN {printf \"%.2f\", $RATE*100}")
echo "Coverage: $PERCENT% (threshold: $VORTEX_CI_CODE_COVERAGE_THRESHOLD%)" | tee -a "$GITHUB_STEP_SUMMARY"
echo "COVERAGE_PERCENT=${PERCENT}" >> "$GITHUB_ENV"
{ echo "COVERAGE_CONTENT<<EOF"; sed '/./,$!d' .logs/coverage/phpunit/coverage.txt; echo "EOF"; } >> "$GITHUB_ENV"
{
echo "COVERAGE_PERCENT=${PERCENT}"
echo "COVERAGE_SUMMARY<<EOF"
awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' .logs/coverage/phpunit/coverage.txt
echo "EOF"
echo "COVERAGE_DETAILS<<EOF"
awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' .logs/coverage/phpunit/coverage.txt
echo "EOF"
} >> "$GITHUB_ENV"
env:
VORTEX_CI_CODE_COVERAGE_THRESHOLD: ${{ vars.VORTEX_CI_CODE_COVERAGE_THRESHOLD || '90' }}

Expand All @@ -396,10 +403,17 @@ jobs:
with:
header: coverage-gha
message: |
**Code coverage (GitHub Actions)**
**Code coverage** (threshold: ${{ vars.VORTEX_CI_CODE_COVERAGE_THRESHOLD || '90' }}%)
```
${{ env.COVERAGE_CONTENT }}
${{ env.COVERAGE_SUMMARY }}
```
<details>
<summary>Per-class coverage</summary>

```
${{ env.COVERAGE_DETAILS }}
```
</details>
hide_and_recreate: true

- name: Upload coverage report to Codecov
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
## GITHUB_TOKEN - GitHub token for API access.
## CIRCLE_PROJECT_USERNAME - GitHub org/user.
## CIRCLE_PROJECT_REPONAME - GitHub repo name.
## VORTEX_CI_CODE_COVERAGE_THRESHOLD - Coverage threshold percentage (default: 90).
##
## Usage:
## .circleci/post-coverage-comment.sh /path/to/coverage.txt
Expand All @@ -32,16 +33,25 @@ if [ -z "${GITHUB_TOKEN:-}" ]; then
exit 0
fi

COVERAGE_CONTENT=$(sed '/./,$!d' "${COVERAGE_FILE}")
COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' "${COVERAGE_FILE}")
COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' "${COVERAGE_FILE}")
PR_NUMBER=$(echo "${CIRCLE_PULL_REQUEST}" | cut -d'/' -f 7)
REPO_SLUG="${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}"
THRESHOLD="${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}"

MARKER="<!-- coverage-circleci -->"

BODY=$(jq -n --arg body "**Code coverage (CircleCI)**
BODY=$(jq -n --arg body "**Code coverage** (threshold: ${THRESHOLD}%)
\`\`\`
${COVERAGE_CONTENT}
${COVERAGE_SUMMARY}
\`\`\`
<details>
<summary>Per-class coverage</summary>

\`\`\`
${COVERAGE_DETAILS}
\`\`\`
</details>
${MARKER}" '{body: $body}')

# Minimize previous coverage comments.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
## GITHUB_TOKEN - GitHub token for API access.
## CIRCLE_PROJECT_USERNAME - GitHub org/user.
## CIRCLE_PROJECT_REPONAME - GitHub repo name.
## VORTEX_CI_CODE_COVERAGE_THRESHOLD - Coverage threshold percentage (default: 90).
##
## Usage:
## .circleci/post-coverage-comment.sh /path/to/coverage.txt
Expand All @@ -32,16 +33,25 @@ if [ -z "${GITHUB_TOKEN:-}" ]; then
exit 0
fi

COVERAGE_CONTENT=$(sed '/./,$!d' "${COVERAGE_FILE}")
COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' "${COVERAGE_FILE}")
COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' "${COVERAGE_FILE}")
PR_NUMBER=$(echo "${CIRCLE_PULL_REQUEST}" | cut -d'/' -f 7)
REPO_SLUG="${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}"
THRESHOLD="${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}"

MARKER="<!-- coverage-circleci -->"

BODY=$(jq -n --arg body "**Code coverage (CircleCI)**
BODY=$(jq -n --arg body "**Code coverage** (threshold: ${THRESHOLD}%)
\`\`\`
${COVERAGE_CONTENT}
${COVERAGE_SUMMARY}
\`\`\`
<details>
<summary>Per-class coverage</summary>

\`\`\`
${COVERAGE_DETAILS}
\`\`\`
</details>
${MARKER}" '{body: $body}')

# Minimize previous coverage comments.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
## GITHUB_TOKEN - GitHub token for API access.
## CIRCLE_PROJECT_USERNAME - GitHub org/user.
## CIRCLE_PROJECT_REPONAME - GitHub repo name.
## VORTEX_CI_CODE_COVERAGE_THRESHOLD - Coverage threshold percentage (default: 90).
##
## Usage:
## .circleci/post-coverage-comment.sh /path/to/coverage.txt
Expand All @@ -32,16 +33,25 @@ if [ -z "${GITHUB_TOKEN:-}" ]; then
exit 0
fi

COVERAGE_CONTENT=$(sed '/./,$!d' "${COVERAGE_FILE}")
COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' "${COVERAGE_FILE}")
COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' "${COVERAGE_FILE}")
PR_NUMBER=$(echo "${CIRCLE_PULL_REQUEST}" | cut -d'/' -f 7)
REPO_SLUG="${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}"
THRESHOLD="${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}"

MARKER="<!-- coverage-circleci -->"

BODY=$(jq -n --arg body "**Code coverage (CircleCI)**
BODY=$(jq -n --arg body "**Code coverage** (threshold: ${THRESHOLD}%)
\`\`\`
${COVERAGE_CONTENT}
${COVERAGE_SUMMARY}
\`\`\`
<details>
<summary>Per-class coverage</summary>

\`\`\`
${COVERAGE_DETAILS}
\`\`\`
</details>
${MARKER}" '{body: $body}')

# Minimize previous coverage comments.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -467,79 +467,3 @@
@@ -481,79 +481,3 @@
timeout-minutes: 120 # Cancel the action after 15 minutes, regardless of whether a connection has been established.
with:
detached: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
## GITHUB_TOKEN - GitHub token for API access.
## CIRCLE_PROJECT_USERNAME - GitHub org/user.
## CIRCLE_PROJECT_REPONAME - GitHub repo name.
## VORTEX_CI_CODE_COVERAGE_THRESHOLD - Coverage threshold percentage (default: 90).
##
## Usage:
## .circleci/post-coverage-comment.sh /path/to/coverage.txt
Expand All @@ -32,16 +33,25 @@ if [ -z "${GITHUB_TOKEN:-}" ]; then
exit 0
fi

COVERAGE_CONTENT=$(sed '/./,$!d' "${COVERAGE_FILE}")
COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' "${COVERAGE_FILE}")
COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' "${COVERAGE_FILE}")
PR_NUMBER=$(echo "${CIRCLE_PULL_REQUEST}" | cut -d'/' -f 7)
REPO_SLUG="${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}"
THRESHOLD="${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}"

MARKER="<!-- coverage-circleci -->"

BODY=$(jq -n --arg body "**Code coverage (CircleCI)**
BODY=$(jq -n --arg body "**Code coverage** (threshold: ${THRESHOLD}%)
\`\`\`
${COVERAGE_CONTENT}
${COVERAGE_SUMMARY}
\`\`\`
<details>
<summary>Per-class coverage</summary>

\`\`\`
${COVERAGE_DETAILS}
\`\`\`
</details>
${MARKER}" '{body: $body}')

# Minimize previous coverage comments.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
## GITHUB_TOKEN - GitHub token for API access.
## CIRCLE_PROJECT_USERNAME - GitHub org/user.
## CIRCLE_PROJECT_REPONAME - GitHub repo name.
## VORTEX_CI_CODE_COVERAGE_THRESHOLD - Coverage threshold percentage (default: 90).
##
## Usage:
## .circleci/post-coverage-comment.sh /path/to/coverage.txt
Expand All @@ -32,16 +33,25 @@ if [ -z "${GITHUB_TOKEN:-}" ]; then
exit 0
fi

COVERAGE_CONTENT=$(sed '/./,$!d' "${COVERAGE_FILE}")
COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' "${COVERAGE_FILE}")
COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' "${COVERAGE_FILE}")
PR_NUMBER=$(echo "${CIRCLE_PULL_REQUEST}" | cut -d'/' -f 7)
REPO_SLUG="${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}"
THRESHOLD="${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}"

MARKER="<!-- coverage-circleci -->"

BODY=$(jq -n --arg body "**Code coverage (CircleCI)**
BODY=$(jq -n --arg body "**Code coverage** (threshold: ${THRESHOLD}%)
\`\`\`
${COVERAGE_CONTENT}
${COVERAGE_SUMMARY}
\`\`\`
<details>
<summary>Per-class coverage</summary>

\`\`\`
${COVERAGE_DETAILS}
\`\`\`
</details>
${MARKER}" '{body: $body}')

# Minimize previous coverage comments.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
## GITHUB_TOKEN - GitHub token for API access.
## CIRCLE_PROJECT_USERNAME - GitHub org/user.
## CIRCLE_PROJECT_REPONAME - GitHub repo name.
## VORTEX_CI_CODE_COVERAGE_THRESHOLD - Coverage threshold percentage (default: 90).
##
## Usage:
## .circleci/post-coverage-comment.sh /path/to/coverage.txt
Expand All @@ -32,16 +33,25 @@ if [ -z "${GITHUB_TOKEN:-}" ]; then
exit 0
fi

COVERAGE_CONTENT=$(sed '/./,$!d' "${COVERAGE_FILE}")
COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' "${COVERAGE_FILE}")
COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' "${COVERAGE_FILE}")
PR_NUMBER=$(echo "${CIRCLE_PULL_REQUEST}" | cut -d'/' -f 7)
REPO_SLUG="${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}"
THRESHOLD="${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}"

MARKER="<!-- coverage-circleci -->"

BODY=$(jq -n --arg body "**Code coverage (CircleCI)**
BODY=$(jq -n --arg body "**Code coverage** (threshold: ${THRESHOLD}%)
\`\`\`
${COVERAGE_CONTENT}
${COVERAGE_SUMMARY}
\`\`\`
<details>
<summary>Per-class coverage</summary>

\`\`\`
${COVERAGE_DETAILS}
\`\`\`
</details>
${MARKER}" '{body: $body}')

# Minimize previous coverage comments.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
- name: Login to container registry
run: ./scripts/vortex/login-container-registry.sh

@@ -471,7 +331,6 @@
@@ -485,7 +345,6 @@
deploy:
runs-on: ubuntu-latest
needs: [build, lint]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
## GITHUB_TOKEN - GitHub token for API access.
## CIRCLE_PROJECT_USERNAME - GitHub org/user.
## CIRCLE_PROJECT_REPONAME - GitHub repo name.
## VORTEX_CI_CODE_COVERAGE_THRESHOLD - Coverage threshold percentage (default: 90).
##
## Usage:
## .circleci/post-coverage-comment.sh /path/to/coverage.txt
Expand All @@ -32,16 +33,25 @@ if [ -z "${GITHUB_TOKEN:-}" ]; then
exit 0
fi

COVERAGE_CONTENT=$(sed '/./,$!d' "${COVERAGE_FILE}")
COVERAGE_SUMMARY=$(awk '/^ *Summary:/{f=1;next} f && /^$/{exit} f' "${COVERAGE_FILE}")
COVERAGE_DETAILS=$(awk 'BEGIN{s=0} /^ *Summary:/{s=1} s==1 && /^$/{s=2;next} s==2' "${COVERAGE_FILE}")
PR_NUMBER=$(echo "${CIRCLE_PULL_REQUEST}" | cut -d'/' -f 7)
REPO_SLUG="${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}"
THRESHOLD="${VORTEX_CI_CODE_COVERAGE_THRESHOLD:-90}"

MARKER="<!-- coverage-circleci -->"

BODY=$(jq -n --arg body "**Code coverage (CircleCI)**
BODY=$(jq -n --arg body "**Code coverage** (threshold: ${THRESHOLD}%)
\`\`\`
${COVERAGE_CONTENT}
${COVERAGE_SUMMARY}
\`\`\`
<details>
<summary>Per-class coverage</summary>

\`\`\`
${COVERAGE_DETAILS}
\`\`\`
</details>
${MARKER}" '{body: $body}')

# Minimize previous coverage comments.
Expand Down
Loading
Loading