One stable branch per release
Currently we have one stable branch each for CE release and EE release. This is a bit of an inherited situation from old days and should not be necessary now.
Diff between 9-3-stable and 9-3-stable-ee shows:
diff --git a/VERSION b/VERSION
index 63769e9..1445f05 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-9.3.2-ee
+9.3.2
diff --git a/docker/openshift-template.json b/docker/openshift-template.json
index ff2296c..57eb927 100644
--- a/docker/openshift-template.json
+++ b/docker/openshift-template.json
@@ -106,10 +106,10 @@
"spec": {
"tags": [
{
- "name": "gitlab-9.3.1",
+ "name": "gitlab-9.3.2",
"from": {
"kind": "DockerImage",
- "name": "gitlab/gitlab-ce:9.3.1-ce.0"
+ "name": "gitlab/gitlab-ce:9.3.2-ce.0"
}
}
]
@@ -171,7 +171,7 @@
],
"from": {
"kind": "ImageStreamTag",
- "name": "${APPLICATION_NAME}:gitlab-9.3.1"
+ "name": "${APPLICATION_NAME}:gitlab-9.3.2"
}
}
}This means we maintain 2 branches only because we need the VERSION file to do a release which is a bit silly.
We should consider adapting lib/gitlab/version.rb to read from GITLAB_VERSION and GITLAB_EE_VERSION.
This also requires changes in the release-tools.