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
4 changes: 2 additions & 2 deletions .github/workflows/cron-main-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 20
timeout-minutes: 45
steps:
- name: "Checkout"
uses: actions/checkout@v4
Expand All @@ -30,7 +30,7 @@ jobs:
- name: "Run E2E test"
run: docker compose run --service-ports e2e bash -c "pytest -v -p no:randomly --no-cov --reportportal --rp-launch=$RP_LAUNCH --rp-api-key=$RP_API_KEY --rp-endpoint=$RP_ENDPOINT --junitxml=e2e-report.xml tests/e2e"
env:
RP_LAUNCH: github-e2e-cron-main
RP_LAUNCH: github-e2e-cron-${{ github.ref_name }}
RP_ENDPOINT: ${{ secrets.RP_ENDPOINT }}
RP_API_KEY: ${{ secrets.RP_API_KEY }}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ name: PR build and merge
on:
pull_request:
types: [opened, synchronize, reopened]
push:
branches:
- main
- "release/**"

permissions:
contents: read
Expand All @@ -15,7 +11,7 @@ jobs:
build:

runs-on: ubuntu-latest
timeout-minutes: 20
timeout-minutes: 45

steps:
- name: "Checkout"
Expand All @@ -41,9 +37,9 @@ jobs:
run: docker compose run --service-ports app_test

- name: "Run E2E test"
run: docker compose run --service-ports e2e bash -c "pytest -v -p no:randomly --no-cov --junitxml=e2e-report.xml tests/e2e"
run: docker compose run --service-ports e2e bash -c "pytest -v -p no:randomly --no-cov --reportportal --rp-launch=$RP_LAUNCH --rp-api-key=$RP_API_KEY --rp-endpoint=$RP_ENDPOINT --junitxml=e2e-report.xml tests/e2e"
env:
RP_LAUNCH: github-e2e-test
RP_LAUNCH: github-e2e-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_number }}
RP_ENDPOINT: ${{ secrets.RP_ENDPOINT }}
RP_API_KEY: ${{ secrets.RP_API_KEY }}

Expand Down
57 changes: 57 additions & 0 deletions .github/workflows/push-release-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: PR build and merge
Copy link

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

Misleading workflow name for push event trigger.

The workflow is named "PR build and merge" but it triggers on push events to main and release/** branches (lines 4-7), not on pull requests. This creates confusion about the workflow's purpose.

Apply this diff to use a more accurate name:

-name: PR build and merge
+name: Push to main/release branches
📝 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
name: PR build and merge
name: Push to main/release branches
🤖 Prompt for AI Agents
.github/workflows/push-release-branch.yml lines 1-1: the workflow name "PR build
and merge" is misleading because the workflow triggers on push to main and
release/** branches; update the name to accurately reflect push-triggered
behavior (for example "Push build and release" or "Push build and merge (push)")
by replacing the name value on line 1 with the chosen descriptive title so it
clearly documents the workflow purpose.


on:
push:
branches:
- main
- "release/**"

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest
timeout-minutes: 45

steps:
- name: "Checkout"
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: "Build test containers"
run: docker compose build app_test e2e

- name: "Create environment file"
run: env | grep -E '^MPT_' > .env
env:
RP_ENDPOINT: ${{ secrets.RP_ENDPOINT }}
RP_API_KEY: ${{ secrets.RP_API_KEY }}
MPT_API_BASE_URL: ${{ secrets.MPT_API_BASE_URL }}
MPT_API_TOKEN: ${{ secrets.MPT_API_TOKEN }}
MPT_API_TOKEN_CLIENT: ${{ secrets.MPT_API_TOKEN_CLIENT }}
MPT_API_TOKEN_OPERATIONS: ${{ secrets.MPT_API_TOKEN_OPERATIONS }}
MPT_API_TOKEN_VENDOR: ${{ secrets.MPT_API_TOKEN_VENDOR }}

- name: "Run validation & test"
run: docker compose run --service-ports app_test

- name: "Run E2E test"
run: docker compose run --service-ports e2e bash -c "pytest -v -p no:randomly --no-cov --reportportal --rp-launch=$RP_LAUNCH --rp-api-key=$RP_API_KEY --rp-endpoint=$RP_ENDPOINT --junitxml=e2e-report.xml tests/e2e"
env:
RP_LAUNCH: github-e2e-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_number }}
RP_ENDPOINT: ${{ secrets.RP_ENDPOINT }}
RP_API_KEY: ${{ secrets.RP_API_KEY }}


- name: "Run SonarCloud Scan"
uses: SonarSource/sonarqube-scan-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

- name: "Stop containers"
if: always()
run: docker compose down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build:

runs-on: ubuntu-latest
timeout-minutes: 20
timeout-minutes: 45

steps:
- name: "Checkout"
Expand Down