search

ACCESS-NRI / ACCESS-OM2

ACCESS-OM2: ACCESS Ocean-Sea Ice Model
Apache License 2.0
5 stars 0 forks source link

Allow Bugfixes to existing versions of `ACCESS-OM2` #50

Closed CodeGat closed 6 months ago

CodeGat commented 7 months ago

Currently, we use main for our bleeding-edge versions of ACCESS-OM2. However, we can't bugfix older versions that people might still be using with our current setup.

Allow bugfixes via backport/*.* branches. Say we have the following versions of ACCESS-OM2 on main:

gitGraph
  commit tag: "2024.01.1"
  branch feature
  checkout feature
  commit
  commit
  checkout main
  merge feature tag: "2024.02.1"

And we need to bugfix both 2024.02.1 and 2024.01.1. 2024.02.1 is easy, we can just do it on the mainline:

gitGraph
  commit tag: "2024.01.1"
  branch feature
  checkout feature
  commit
  commit
  checkout main
  merge feature tag: "2024.02.1"
  branch bugfix
  checkout bugfix
  commit
  checkout main
  merge bugfix tag: "2024.02.2"

But we need to bugfix 2024.01.1 and so need to create a backport branch off main, and do the fix there:

gitGraph
  commit tag: "2024.01.1"
  branch backport/2024.01
  checkout backport/2024.01
  branch backported-bugfix
  checkout backported-bugfix
  commit
  checkout backport/2024.01
  merge backported-bugfix tag: "2024.01.2"
  checkout main
  branch feature
  checkout feature
  commit
  commit
  checkout main
  merge feature tag: "2024.02.1"
  branch bugfix
  checkout bugfix
  commit
  checkout main
  merge bugfix tag: "2024.02.2"

Allow this functionality for the CI/CD.