From b16be39691a9384dfc0cc56c3c65326678ec788a Mon Sep 17 00:00:00 2001 From: Sukanya Rath <98050194+sukanya-rath@users.noreply.github.com> Date: Wed, 30 Oct 2024 09:12:03 -0700 Subject: [PATCH] feat: Updates documentation for GEO-1090 (#830) --- README.md | 5 +++-- admin-frontend/.gitignore | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b7f1f8e4..bd0f83f1 100644 --- a/README.md +++ b/README.md @@ -138,9 +138,10 @@ flowchart A[Last Released To Production Tag ex: 1.17.2] -->|create a hotfix branch from the tag ex: hotfix/1.17.2_hotfix.1| B(Make Changes) A[Last Released To Production Tag ex: 1.17.2] -->|create releases/hotfix branch from the tag | C( Branch to Which pull request will be raised) B --> C[Create pull request to releases/hotfix branch, from the hotfix/x.x.x_hotfix.x branch] - C --> D[Changes Deployed to Dev environment with Crunchy DB, follow .github/workflows/ci_cd_on_pr_hotfix.yml] + C --> D[Changes Deployed to Dev environment with Postgres DB, follow .github/workflows/ci_cd_on_pr_hotfix.yml] D -->|On Approval and Merge to releases/hotfix| E[Clean up PR environment and create the new Docker Tags and GitHub Tag] - E -->|Promote to PROD, using the tag that was generated in previous step | F[Promote to Prod using branch releases/hotfix using existing github workflow, cd-to-prod-on-workflow-dispatch.yml] + E -->|Promote to PROD, using the tag that was generated in previous step | F[Promote to Prod using branch releases/hotfix using existing github workflow, check the is hostfix deployment to true, cd-to-prod-on-workflow-dispatch.yml] F -->|Create a PR to main branch from releases/hotfix| G[Resolve Merge Conflicts here and promote through, DEV and TEST] + H--> |Close the releases/hotfix branch| ``` diff --git a/admin-frontend/.gitignore b/admin-frontend/.gitignore index 546f2a56..555db2ae 100644 --- a/admin-frontend/.gitignore +++ b/admin-frontend/.gitignore @@ -7,6 +7,7 @@ yarn-debug.log* yarn-error.log* /tests/unit/coverage/ /tests/e2e/reports/ +/e2e/assets/announcements/invalid.com selenium-debug.log junit.xml test-report.xml