Skip to content

Commit a409eaa

Browse files
Merge pull request #7 from devopsabcs-engineering/feature/6-add-git-workflow-standards
Add Git Workflow Standards and fix ZAP action reference
2 parents eff2971 + 33dca15 commit a409eaa

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

.github/copilot-instructions.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,15 @@
88
- If I tell you that you are wrong, think about whether or not you think that's true and respond with facts.
99
- Avoid apologizing or making conciliatory statements.
1010
- It is not necessary to agree with the user with statements such as "You're right" or "Yes".
11-
- Avoid hyperbole and excitement, stick to the task at hand and complete it pragmatically.
11+
- Avoid hyperbole and excitement, stick to the task at hand and complete it pragmatically.
12+
13+
## Git Workflow Standards
14+
15+
- Every code change MUST have an associated GitHub issue created before starting work.
16+
- Use feature branches for all development work. Branch naming convention: `feature/<issue-number>-<short-description>` (e.g., `feature/42-add-login-page`).
17+
- Feature branches MUST be created off of the `main` branch.
18+
- All commits MUST reference the associated GitHub issue using keywords (e.g., `Fixes #42`, `Closes #42`, `Relates to #42`).
19+
- Push feature branches to the remote repository regularly to enable collaboration and backup.
20+
- Create a pull request (PR) to merge the feature branch back into `main` once the work is complete.
21+
- PRs MUST reference the associated GitHub issue in the description.
22+
- Delete feature branches after they have been merged into `main`.

.github/workflows/DAST-ZAP-Zed-Attach-Proxy-Checkmarx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- name: Show results
6262
run: |
6363
ls
64-
- uses: githubabcs-devops/zap-to-ghas@main
64+
- uses: devopsabcs-engineering/zap-to-ghas@main
6565

6666
- name: Upload SARIF file
6767
uses: github/codeql-action/upload-sarif@v3

0 commit comments

Comments
 (0)