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
25 changes: 14 additions & 11 deletions git-migration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
This project is aimed to migrate the Met Office simulation systems repositories
to Git ecosystem. See MetOffice/simulation-systems/discussions/337 for details.

> [!NOTE] Pre-requisites to run the migration script
> [!NOTE]
> **Pre-requisites to run the migration script**
>
> - Read access to the Met Office Science Repository [MOSRS](https://code.metoffice.gov.uk/trac/home) or the Met Office internal mirror (~~`svn://fcm1`~~ `https://metomi/svn`).
> - Optional Write access to the [Met Office GitHub organisation](https://github.com/MetOffice) for push to remote (usually, an admin).
> - Tools: [`fcm`](https://metomi.github.io/fcm/doc/user_guide/introduction.html), [`git`](https://git-scm.com), [`gitlify`](https://github.com/MetOffice/gitlify), [`jq`](https://jqlang.org), and [`gh`](https://cli.github.com) available on the system.

## Checklist

1. Test `gitlify` translation tool
1. Test `gitlify` translation tool :white_check_mark:
- [x] Able to convert only svn trunk to Git.
- [x] Able to map svn revisions to Git tag.
- [x] Synchronise trunk updates locally in Git repositories.
Expand All @@ -22,14 +23,14 @@ to Git ecosystem. See MetOffice/simulation-systems/discussions/337 for details.
- [x] `svn:um/aux` (@trunk) → [um_aux](https://github.com/MetOffice/um_aux) (@trunk)
- [x] `svn:um/meta` (@trunk) → [um_meta](https://github.com/MetOffice/um_meta) (@trunk)
- [x] `svn:um/doc` (@trunk) → [um_doc](https://github.com/MetOffice/um_doc) (@trunk)
- [x] Compress/convert large graphics in the repository consulting the authors/IAO, if possible. (_in progress..._)
- [x] Compress/convert large graphics in the repository consulting the authors/IAO, if possible.
- [ ] Implement GitHub Action to build/deploy docs: test using [texlive docker image](https://hub.docker.com/r/texlive/texlive/tags?name=2018)
- [x] `svn:um/mule` (@trunk) → [mule](https://github.com/MetOffice/mule) (@trunk)
- [x] Contact [metomi](https://github.com/metomi/mule) owner to deprecate their repository.
- [x] `svn:gcom/main` (@trunk) → [gcom](https://github.com/MetOffice/gcom) (@trunk)
- [x] `svn:jules/main` (@trunk) → [jules](https://github.com/MetOffice/jules) (@trunk)
- [ ] Check licence agreements, if going public. (_in progress..._)
- [ ] Plan to migrate JULES documentation here.
- [x] Check licence agreements, if going public. (_JULES in progress..._)
- [ ] Plan to migrate JULES documentation here (post migration).
- [x] `svn:socrates/main` (@trunk) → [socrates](https://github.com/MetOffice/socrates) (@trunk)
- [x] `svn:utils/shumlib` (@trunk) → [shumlib](https://github.com/MetOffice/shumlib) (@trunk)
- [x] Contact [metomi](https://github.com/metomi/shumlib) owner to deprecate their repository.
Expand All @@ -40,21 +41,23 @@ to Git ecosystem. See MetOffice/simulation-systems/discussions/337 for details.
- [x] Repository already exists: ask for admin access to the repository.
- [x] `svn:lfric/GPL-utilities` (@trunk) → [rose_picker](https://github.com/MetOffice/rose_picker) (@trunk)
- [x] `svn:lfric_apps/main` (@trunk) → [lfric_apps](https://github.com/MetOffice/lfric_apps) (@trunk)
- [ ] Propose `lfric_core` as a submodule in this repository?
- [ ] Propose `lfric_core` as a submodule in this repository? (post migration)
- [x] `svn:monc/main` (@trunk) → [monc](https://github.com/MetOffice/monc) (@trunk)
- [x] Check `config.json` is correct and up-to-date with MOSRS revisions.

3. General updated for all repositories
3. General updates for all repositories (during migration)
- [x] All _private_ with specific team access only.
- [x] Repository Description.
- [ ] `README.md`
- [ ] `LICENCE`
- [ ] `CONTRIBUTING.md` (CLA)
- [ ] `README.md` (_in progress..._)
- [ ] `LICENCE` (_in progress..._)
- [ ] `CONTRIBUTING.md` (CLA) (_in progress..._)
- [ ] Automated Code Quality checks via GitHub Action (_in progress..._)
- [ ] Correct Copyright statements, particularly in planned open-source repositories. (_in progress..._)
- [ ] ~~Map SRS to GitHub username, where possible.~~

4. Testbed
- [ ] Create additional `main` branches.
- [ ] Test Fab (build tool) integration. (_in progress..._)
- [ ] Test Fab (build tool) integration. (_post migration_)
- [ ] Test Simulation System workflows with GitHub.
- [x] Make sure tags/releases are still functional.
- [ ] Update Working practices. (_in progress..._)
Expand Down
29 changes: 25 additions & 4 deletions git-migration/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"trunk": "monc/casim",
"tags": [
{ "apps2.1": 11730 },
{ "apps2.2": 11952 },
{ "um10.7": 3236 },
{ "um10.8": 3236 },
{ "um10.9": 3813 },
Expand All @@ -34,6 +35,7 @@
{ "um13.6": 11231 },
{ "um13.7": 11589 },
{ "um13.8": 11730 },
{ "um13.9": 11952 },
{ "vn0.1": 1111 },
{ "vn0.2": 3236 },
{ "vn0.2.1": 3415 },
Expand Down Expand Up @@ -90,6 +92,7 @@
"trunk": "jules/main",
"tags": [
{ "apps2.1": 29791 },
{ "apps2.2": 30458 },
{ "um8.0": 3 },
{ "um8.1": 3 },
{ "um8.2": 7 },
Expand Down Expand Up @@ -134,6 +137,8 @@
{ "um13.6": 28692 },
{ "um13.7": 29181 },
{ "um13.8": 29791 },
{ "um13.8.1": 29986 },
{ "um13.9": 30414 },
{ "vn3.1": 11 },
{ "vn3.2": 27 },
{ "vn3.3": 52 },
Expand Down Expand Up @@ -183,6 +188,7 @@
"trunk": "socrates/main",
"tags": [
{ "apps2.1": 1745 },
{ "apps2.2": 1846 },
{ "um10.1": 1 },
{ "um10.2": 11 },
{ "um10.3": 36 },
Expand Down Expand Up @@ -225,6 +231,7 @@
"trunk": "ukca/main",
"tags": [
{ "apps2.1": 5509 },
{ "apps2.2": 6356 },
{ "um13.0": 264 },
{ "um13.1": 611 },
{ "um13.2": 1218 },
Expand Down Expand Up @@ -377,7 +384,8 @@
{ "vn13.5": 123441 },
{ "vn13.6": 125228 },
{ "vn13.7": 127063 },
{ "vn13.8": 128862 }
{ "vn13.8": 128862 },
{ "vn13.9": 130315 }
]
},
{
Expand Down Expand Up @@ -490,12 +498,13 @@
{ "vn1.2.1": 5299 },
{ "vn2.0": 5732 },
{ "vn2.0.1": 5838 },
{ "vn2.1": 8283 }
{ "vn2.1": 8283 },
{ "vn2.2": 12057 }
]
},
{
"name": "lfric_core",
"description": "Software infrastructure that supports the Momentum Atmosphere model",
"description": "LFRic Infrastructure",
"trunk": "lfric/LFRic",
"tags": [
{ "um12.0": 30137 },
Expand All @@ -513,14 +522,26 @@
{ "core1.2": 51381 },
{ "core1.2.1": 51467 },
{ "core2.0": 51632 },
{ "core2.1": 52315 }
{ "core2.1": 52315 },
{ "core2.2": 53282 }
]
},
{
"name": "rose_picker",
"description": "LFRic GPL Tools",
"trunk": "lfric/GPL-utilities",
"tags": []
},
{
"name": "monc",
"description": "The Met Office-NERC Cloud (MONC) Model",
"trunk": "monc/main",
"tags": [
{ "vn0.7": 2226 },
{ "vn0.8": 3628 },
{ "vn0.9.0": 7765 },
{ "vn1.0.0": 10936 }
]
}
]
}