From ff181b4b406e7bad2b9431cd75060e0a256ad441 Mon Sep 17 00:00:00 2001 From: Robin Long Date: Tue, 17 Sep 2024 10:58:38 +0100 Subject: [PATCH 1/6] Add diagrams to governance page --- team/governance/diagrams/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/team/governance/diagrams/README.md b/team/governance/diagrams/README.md index 8f96de1..1ea6059 100644 --- a/team/governance/diagrams/README.md +++ b/team/governance/diagrams/README.md @@ -12,12 +12,17 @@ A set of graphviz dotfiles intended to be read end to end. Drawn in [SketchViz]( Outline of the flow from a group seeking RSE contribution to a proposed project, to deciding whether it's appropriate to take forward or there are preferable routes (e.g. towards Scientific Computing or People Development). +![Application phase diagram](application.svg) + ### Triage phase Outline of the flow from receiving a definite expression of interest through EDS Enquiries, to gauging whether a project is suitable to take forward to the committee. It's probably this phase that needs the most consideration from, and adaptation by, members of the RSE group. +![Triage phase diagram](triage.svg) + ### Proposal phase Outline of the flow from receiving a proposal through a formal channel, to the committee including Science Area representatives and budget holders, to a decision about whether the group has the capacity to work on it in the timeline. +![Concept phase diagram](concept.svg) From 309751b8c1caa2cab042b2849641b8345c8d8325 Mon Sep 17 00:00:00 2001 From: Robin Long Date: Tue, 17 Sep 2024 11:27:35 +0100 Subject: [PATCH 2/6] changing workflow --- .github/workflows/pages_graphs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pages_graphs.yml b/.github/workflows/pages_graphs.yml index fa74c18..8af5414 100644 --- a/.github/workflows/pages_graphs.yml +++ b/.github/workflows/pages_graphs.yml @@ -2,7 +2,7 @@ name: Pages and Graphviz re-render on: push: branches: - - '!100_days' + - '*' # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages permissions: @@ -54,4 +54,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v2 \ No newline at end of file + uses: actions/deploy-pages@v2 From 829bf2222b84e2ab56a43734942b45b86302690b Mon Sep 17 00:00:00 2001 From: Robin Long Date: Tue, 17 Sep 2024 11:47:05 +0100 Subject: [PATCH 3/6] updated README to include links and team. --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 68776db..a939eea 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,20 @@ This repository is a shared space for notes and guidance for the Research Software Engineering group at the UK Centre for Ecology and Hydrology +# Who are we? + +We are the RSE team at UKCEH. We are based in the Environmental Data Science Group, within the Pollutions Science Area at UKCEH. We want to, and can, help with your Research Software needs all across UKCEH. The RSE team consists of 6 people: + +* [Matt Brown](https://mattjbr123.github.io/) +* [Jo Walsh](https://github.com/metazool/) +* Matt Coole +* [Robin Long](htttps://longr.github.io) +* Alba Gomez Segura +* Joe Marsh Rossney + +# Links + +- [Team Agreement](team/agreement.md) +- [Governance and working with RSE group](team/governance/diagrams/README.md) +- [Some FAQs on RSE/CEH](q_and_a/README.md) From 92f57a6ad0c550aaec4139cd1e3369bf9e20c4cc Mon Sep 17 00:00:00 2001 From: Robin Long Date: Tue, 17 Sep 2024 12:14:54 +0100 Subject: [PATCH 4/6] Add branches exclusion for 100 days --- .github/workflows/pages_graphs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pages_graphs.yml b/.github/workflows/pages_graphs.yml index 8af5414..0ac942c 100644 --- a/.github/workflows/pages_graphs.yml +++ b/.github/workflows/pages_graphs.yml @@ -3,6 +3,7 @@ on: push: branches: - '*' + - '!100_days' # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages permissions: From 7c2ca3fe77fd2a9dd823c158e119e345f7344543 Mon Sep 17 00:00:00 2001 From: Robin Long Date: Tue, 17 Sep 2024 13:30:31 +0100 Subject: [PATCH 5/6] Changed action to only run on main as branch protection in place. --- .github/workflows/pages_graphs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pages_graphs.yml b/.github/workflows/pages_graphs.yml index 0ac942c..78e06fd 100644 --- a/.github/workflows/pages_graphs.yml +++ b/.github/workflows/pages_graphs.yml @@ -2,7 +2,7 @@ name: Pages and Graphviz re-render on: push: branches: - - '*' + - 'main' - '!100_days' # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages From a114fc2ad532bc99de20789f4570a12634fedc0e Mon Sep 17 00:00:00 2001 From: albags Date: Thu, 19 Sep 2024 11:36:12 +0100 Subject: [PATCH 6/6] Update README.md Add my Gihub to the README page. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a939eea..8211987 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ We are the RSE team at UKCEH. We are based in the Environmental Data Science G * [Jo Walsh](https://github.com/metazool/) * Matt Coole * [Robin Long](htttps://longr.github.io) -* Alba Gomez Segura +* [Alba Gomez Segura](https://github.com/albags) * Joe Marsh Rossney # Links