Skip to content

Commit 9b017ef

Browse files
authored
Add monc (#103)
1 parent 7a8809d commit 9b017ef

2 files changed

Lines changed: 39 additions & 15 deletions

File tree

git-migration/README.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
This project is aimed to migrate the Met Office simulation systems repositories
44
to Git ecosystem. See MetOffice/simulation-systems/discussions/337 for details.
55

6-
> [!NOTE] Pre-requisites to run the migration script
6+
> [!NOTE]
7+
> **Pre-requisites to run the migration script**
78
>
89
> - 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`).
910
> - Optional Write access to the [Met Office GitHub organisation](https://github.com/MetOffice) for push to remote (usually, an admin).
1011
> - 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.
1112
1213
## Checklist
1314

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

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

5558
4. Testbed
5659
- [ ] Create additional `main` branches.
57-
- [ ] Test Fab (build tool) integration. (_in progress..._)
60+
- [ ] Test Fab (build tool) integration. (_post migration_)
5861
- [ ] Test Simulation System workflows with GitHub.
5962
- [x] Make sure tags/releases are still functional.
6063
- [ ] Update Working practices. (_in progress..._)

git-migration/config.json

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"trunk": "monc/casim",
99
"tags": [
1010
{ "apps2.1": 11730 },
11+
{ "apps2.2": 11952 },
1112
{ "um10.7": 3236 },
1213
{ "um10.8": 3236 },
1314
{ "um10.9": 3813 },
@@ -34,6 +35,7 @@
3435
{ "um13.6": 11231 },
3536
{ "um13.7": 11589 },
3637
{ "um13.8": 11730 },
38+
{ "um13.9": 11952 },
3739
{ "vn0.1": 1111 },
3840
{ "vn0.2": 3236 },
3941
{ "vn0.2.1": 3415 },
@@ -90,6 +92,7 @@
9092
"trunk": "jules/main",
9193
"tags": [
9294
{ "apps2.1": 29791 },
95+
{ "apps2.2": 30458 },
9396
{ "um8.0": 3 },
9497
{ "um8.1": 3 },
9598
{ "um8.2": 7 },
@@ -134,6 +137,8 @@
134137
{ "um13.6": 28692 },
135138
{ "um13.7": 29181 },
136139
{ "um13.8": 29791 },
140+
{ "um13.8.1": 29986 },
141+
{ "um13.9": 30414 },
137142
{ "vn3.1": 11 },
138143
{ "vn3.2": 27 },
139144
{ "vn3.3": 52 },
@@ -183,6 +188,7 @@
183188
"trunk": "socrates/main",
184189
"tags": [
185190
{ "apps2.1": 1745 },
191+
{ "apps2.2": 1846 },
186192
{ "um10.1": 1 },
187193
{ "um10.2": 11 },
188194
{ "um10.3": 36 },
@@ -225,6 +231,7 @@
225231
"trunk": "ukca/main",
226232
"tags": [
227233
{ "apps2.1": 5509 },
234+
{ "apps2.2": 6356 },
228235
{ "um13.0": 264 },
229236
{ "um13.1": 611 },
230237
{ "um13.2": 1218 },
@@ -377,7 +384,8 @@
377384
{ "vn13.5": 123441 },
378385
{ "vn13.6": 125228 },
379386
{ "vn13.7": 127063 },
380-
{ "vn13.8": 128862 }
387+
{ "vn13.8": 128862 },
388+
{ "vn13.9": 130315 }
381389
]
382390
},
383391
{
@@ -490,12 +498,13 @@
490498
{ "vn1.2.1": 5299 },
491499
{ "vn2.0": 5732 },
492500
{ "vn2.0.1": 5838 },
493-
{ "vn2.1": 8283 }
501+
{ "vn2.1": 8283 },
502+
{ "vn2.2": 12057 }
494503
]
495504
},
496505
{
497506
"name": "lfric_core",
498-
"description": "Software infrastructure that supports the Momentum Atmosphere model",
507+
"description": "LFRic Infrastructure",
499508
"trunk": "lfric/LFRic",
500509
"tags": [
501510
{ "um12.0": 30137 },
@@ -513,14 +522,26 @@
513522
{ "core1.2": 51381 },
514523
{ "core1.2.1": 51467 },
515524
{ "core2.0": 51632 },
516-
{ "core2.1": 52315 }
525+
{ "core2.1": 52315 },
526+
{ "core2.2": 53282 }
517527
]
518528
},
519529
{
520530
"name": "rose_picker",
521531
"description": "LFRic GPL Tools",
522532
"trunk": "lfric/GPL-utilities",
523533
"tags": []
534+
},
535+
{
536+
"name": "monc",
537+
"description": "The Met Office-NERC Cloud (MONC) Model",
538+
"trunk": "monc/main",
539+
"tags": [
540+
{ "vn0.7": 2226 },
541+
{ "vn0.8": 3628 },
542+
{ "vn0.9.0": 7765 },
543+
{ "vn1.0.0": 10936 }
544+
]
524545
}
525546
]
526547
}

0 commit comments

Comments
 (0)