Skip to content

Commit

Permalink
Merge branch 'main' into johnc/security-design
Browse files Browse the repository at this point in the history
  • Loading branch information
johncollinson2001 committed Oct 7, 2024
2 parents 1a516e2 + 7af3746 commit 4c32074
Show file tree
Hide file tree
Showing 62 changed files with 3,429 additions and 2,078 deletions.
30 changes: 30 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!-- markdownlint-disable MD041 -->

## Description

Please provide a brief summary of the changes made in this pull request.

## Type of change

Please check the relevant options:

- [ ] New feature (a change which adds functionality)
- [ ] Bug fix (a change which fixes an issue)
- [ ] Refactoring (code cleanup or optimization)
- [ ] Testing (enhanced test coverage, or test improvement)
- [ ] Documentation (changes to documentation)
- [ ] Other (something that's not listed here - please explain in the description or additional information)

## Checklist

Please check or cross through each option:

- [ ] My code aligns with the style of this project
- [ ] I have added comments in hard to understand areas
- [ ] I have added tests that prove my change works
- [ ] I have updated the documentation
- [ ] The CI build is passing for my PR

## Additional Information

Please provide any additional information or context related to this pull request.
3 changes: 2 additions & 1 deletion .github/workflows/ci-pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ jobs:
- name: Run End to End Tests
run: |
go mod tidy
go test -v -timeout 10m
go test -v -timeout 30m
working-directory: tests/end-to-end-tests
env:
GOMAXPROCS: 8
ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
ARM_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
Expand Down
39 changes: 39 additions & 0 deletions .github/workflows/docs-pipeline.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Deploy Documentation

permissions:
contents: write

on:
push:
branches:
- main

jobs:
deploy:
name: Deploy Documentation
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Configure Git Credentials
run: |
git config user.name github-actions[bot]
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
- uses: actions/setup-python@v5
with:
python-version: 3.x

- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV

- uses: actions/cache@v4
with:
key: mkdocs-material-${{ env.cache_id }}
path: .cache
restore-keys: |
mkdocs-material-
- run: pip install mkdocs-material

- run: mkdocs gh-deploy --force
5 changes: 5 additions & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"default": true,
"MD007": { "indent": 4 },
"MD013": false
}
49 changes: 13 additions & 36 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,42 +1,19 @@
# Contribution Guidelines
# Contributing

Before you start contributing to the project, please read the following guidelines. We follow the below guidelines to contribute to this repository.
If you want to contribute to the project, raise a PR on GitHub.

## How To Contribute
We use pre-commit to run analysis and checks on the changes being committed. Take the following steps to ensure the pre-commit hook is installed and working:

* **DO** submit all changes via pull requests (PRs). They will be reviewed and potentially merged after a peer review from at least one maintainer.
* **DO** give PRs short but descriptive names.
* **DO** write a useful but brief description of what the PR is for.
* **DO** ensure each commit successfully builds. The entire PR must pass all checks before it will be merged.
* **DO** address PR feedback in additional commits instead of amending.
* **DO NOT** submit "work in progress" PRs. Please mark them as *Draft*. A PR should only be submitted when it is considered ready for review.
* **DO NOT** mix independent and unrelated changes in one PR.
* If there is a major upgrade or a feature addition to the project, it might be a good idea to get started with a Github issue or a Github discussion to discuss the feature or the upgrade before starting a PR on the upgrade.
1. Install git
* Ensure the git `bin` directory has been added to %PATH%: `C:\Program Files\Git\bin`

## Pull Requests
1. Install Python
* Ensure the python `bin` directory has been added to %PATH%

We use pull requests to review and merge code into the `main` branch.
1. Install pre-commit
* Open a terminal and navigate to the repository root directory
* Install pre-commit with the following command: `pip install pre-commit`
* Install pre-commit within the repository with the following command: `pre-commit install`
* Run `pre-commit run --all-files` to check pre-commit is working

Please follow the steps below to create a pull request:

1. Fork the repository from the `main` branch ( Refer steps to [create a fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo)). We use `main` branch only for sync'ing forks. All development contributions should be made to the `development` branch.

1. Create a new branch (example `development`) in your forked repository for your feature or bug fix. Detailed branching and development strategy is outline in [this guide](docs/setup-guide.md#diagram-for-forking-and-syncing).

1. Make sure the pre-commit hook is installed and working:
1. Install pre-commit using this [link](https://pre-commit.com/#installation)
1. Run `pre-commit run --all-files` from the root of the repository.
1. Follow [these](https://github.com/pocc/pre-commit-hooks?tab=readme-ov-file#information-about-the-commands) instructions to install the commands

1. Run tests, linters and checks locally and make sure the pipeline is passing

1. Make sure the pipeline is passing

1. Make sure you have each PR reviewed

1. Once the PR is approved, merge it to the `main` branch, preferably using `Squash and Merge`

## Coding Style

We use [.NET source code analyzer](https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/overview?tabs=net-8) to enforce code style.
Please make sure you have the pre-commit hook installed and working.
> For full details [see this link](https://pre-commit.com/#installation)
2 changes: 1 addition & 1 deletion LICENCE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT Licence

Copyright (c) 2023 Crown Copyright NHS England.
Copyright (c) 2024 Crown Copyright NHS England.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 4c32074

Please sign in to comment.