Skip to content

Commit

Permalink
Merge branch 'develop' into 2283-internet-access-tier0-tier1
Browse files Browse the repository at this point in the history
  • Loading branch information
cptanalatriste committed Dec 5, 2024
2 parents c49a227 + b13d1b3 commit 4baa8bd
Show file tree
Hide file tree
Showing 41 changed files with 953 additions and 495 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/deployment_bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ Before reporting a problem please check the following. Replace the empty checkbo
<summary>List of packages</summary>

<!--
Powershell: Run `deployment/CheckRequirements.ps1` and paste the output below
Python: Run `hatch run pip freeze` and paste the output below
-->

Expand Down
25 changes: 13 additions & 12 deletions .github/ISSUE_TEMPLATE/release_checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Before reporting a problem please check the following. Replace the empty checkbo

Refer to the [Deployment](https://data-safe-haven.readthedocs.io/en/latest/deployment) section of our documentation when completing these steps.

- [ ] Consult the `data-safe-haven/VERSIONING.md` guide and determine the version number of the new release. Record it in the title of this issue.
- [ ] Consult the `data-safe-haven/VERSIONING.md` guide and determine the version number of the new release. Record it in the title of this issue
- [ ] Create a release branch called e.g. `release-v0.0.1`
- [ ] Draft a changelog for the release similar to our previous releases, see https://github.com/alan-turing-institute/data-safe-haven/releases
- [ ] Draft a changelog for the release similar to our [previous releases](https://github.com/alan-turing-institute/data-safe-haven/releases)

### For patch releases only

Expand All @@ -34,26 +34,27 @@ Refer to the [Deployment](https://data-safe-haven.readthedocs.io/en/latest/deplo
### For major releases only

- [ ] Confirm that a third party has carried out a full penetration test evaluating:
1. external attack surface
1. ability to exfiltrate data from the system
1. ability to transfer data between SREs
1. ability to escalate privileges on the SRD.
1. external attack surface
1. ability to exfiltrate data from the system
1. ability to transfer data between SREs
1. ability to escalate privileges on the SRD.

### Update documentation

- [ ] Update supported versions in `SECURITY.md`
- [ ] Update pen test results in `VERSIONING.md`

## :computer: Release information
### Making the release

- **Version number:** _
- **SHM ID:** _
- **T2 SRE ID:** _
- **T3 SRE ID:** _
- [ ] Merge release branch into `latest`
- [ ] Create a tag of the form `v0.0.1` pointing to the most recent commit on `latest` (the merge that you just made)
- [ ] Publish your draft GitHub release using this tag
- [ ] Ensure docs for the latest version are built and deployed on ReadTheDocs
- [ ] Push a build to PyPI
- [ ] Announce release on communications channels

## :deciduous_tree: Deployment problems

<!--
Keep a record in this issue of problems and fixes implemented during the release process. Be sure to update the changelog if any new commits are added to the release branch.
-->

19 changes: 0 additions & 19 deletions .github/scripts/update_azure_data_studio.py

This file was deleted.

72 changes: 0 additions & 72 deletions .github/scripts/update_dbeaver_drivers.py

This file was deleted.

21 changes: 0 additions & 21 deletions .github/scripts/update_rstudio.py

This file was deleted.

167 changes: 0 additions & 167 deletions .github/security_checklist_template.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/lint_code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
done
rm expanded.tmp
- name: Lint YAML
uses: karancode/yamllint-github-action@v2.1.1
uses: karancode/yamllint-github-action@v3.0.0
with:
yamllint_strict: true
yamllint_comment: false
Loading

0 comments on commit 4baa8bd

Please sign in to comment.