From 721187c44f63500e31729ddd9dece65816d34926 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <hello@paulgessinger.com>
Date: Wed, 5 Feb 2020 17:42:49 +0100
Subject: [PATCH 1/3] add ci check to make sure master version is 9.9.9

---
 .gitlab-ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c09b7c56..dce36ff55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,16 @@ include_guards:
   script:
     - CI/check_include_guards.py . --fail-global --exclude "*thirdparty/*"
 
+version_number:
+  stage: check
+  image: alpine:3.6
+  before_script: []
+  only:
+    - master
+    - merge_requests
+  script:
+    grep "9.9.9" version_number # make sure the version number in master is 9.9.9
+
 # job templates w/ default settings
 #
 # the build directory is always `build`. To select a specific build version
-- 
GitLab


From c35581d17c815970046f5631314f38ad9ebc044e Mon Sep 17 00:00:00 2001
From: Paul Gessinger <hello@paulgessinger.com>
Date: Wed, 5 Feb 2020 17:56:14 +0100
Subject: [PATCH 2/3] don't use only:mr

---
 .gitlab-ci.yml | 39 ++++-----------------------------------
 1 file changed, 4 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dce36ff55..8adb5b164 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,9 +54,10 @@ version_number:
   stage: check
   image: alpine:3.6
   before_script: []
-  only:
-    - master
-    - merge_requests
+  except:
+    variables:
+      - $CI_COMMIT_REF_NAME == "^release/.*$"
+
   script:
     grep "9.9.9" version_number # make sure the version number in master is 9.9.9
 
@@ -188,38 +189,6 @@ integration_tests_cc7_lcg96:
   before_script:
     - set +e && source CI/setup_lcg96.sh; set -e
 
-# CC7, LCG96, LLVM9 + libstdc++
-
-build_cc7_lcg96_llvm9:
-  <<: *template_build
-  image: gitlab-registry.cern.ch/acts/machines/cc7:latest
-  before_script:
-    - set +e && source CI/setup_lcg96.sh; set -e
-    - export LLVM_ACTS_VERSION=9.0.0
-    - set +e && source CI/setup_llvm.sh; set -e
-
-unit_tests_cc7_lcg96_llvm9:
-  <<: *template_unit_tests
-  dependencies:
-    - build_cc7_lcg96_llvm9
-  needs: ["build_cc7_lcg96_llvm9"]
-  image: gitlab-registry.cern.ch/acts/machines/cc7:latest
-  before_script:
-    - set +e && source CI/setup_lcg96.sh; set -e
-    - export LLVM_ACTS_VERSION=9.0.0
-    - set +e && source CI/setup_llvm.sh; set -e
-
-integration_tests_cc7_lcg96_llvm9:
-  <<: *template_integration_tests
-  dependencies:
-    - build_cc7_lcg96_llvm9
-  needs: ["build_cc7_lcg96_llvm9"]
-  image: gitlab-registry.cern.ch/acts/machines/cc7:latest
-  before_script:
-    - set +e && source CI/setup_lcg96.sh; set -e
-    - export LLVM_ACTS_VERSION=9.0.0
-    - set +e && source CI/setup_llvm.sh; set -e
-
 # SLC6, LCG96, build w/ legacy disabled
 
 build_cc7_lcg96_no_legacy:
-- 
GitLab


From 13e636ab14efb46ef6eed883313355400b4e2efb Mon Sep 17 00:00:00 2001
From: Paul Gessinger <hello@paulgessinger.com>
Date: Wed, 5 Feb 2020 18:46:10 +0100
Subject: [PATCH 3/3] set version number to 9.9.9 again

---
 .gitlab-ci.yml | 3 ++-
 version_number | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8adb5b164..9d858b8bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,8 @@ version_number:
       - $CI_COMMIT_REF_NAME == "^release/.*$"
 
   script:
-    grep "9.9.9" version_number # make sure the version number in master is 9.9.9
+    - cat version_number
+    - grep "9.9.9" version_number # make sure the version number anywhere but on release branches is 9.9.9
 
 # job templates w/ default settings
 #
diff --git a/version_number b/version_number
index 0548fb4e9..c5c9fb1f4 100644
--- a/version_number
+++ b/version_number
@@ -1 +1 @@
-0.14.0
\ No newline at end of file
+9.9.9
-- 
GitLab