From 8ffc61bdb75fa720a00e8691473d7b37494a226e Mon Sep 17 00:00:00 2001
From: Hans Dembinski <hans.dembinski@gmail.com>
Date: Wed, 28 Nov 2018 16:08:35 +0100
Subject: [PATCH 1/7] basic ci script
---
.gitlab-ci.yml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..930d2a234
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,14 @@
+image: gcc
+
+before_script:
+ - apt-get update --yes
+ - apt-get install --yes cmake libboost-dev libeigen3-dev
+
+build:
+ stage: build
+ script:
+ - mkdir build
+ - cd build
+ - cmake ..
+ - cmake --build .
+ - ctest -V
--
GitLab
From 74b008571c7ccaa4fcd209cbc3d56824b1a706c4 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Wed, 5 Dec 2018 21:13:42 +0100
Subject: [PATCH 2/7] added tag
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 930d2a234..68f143e04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,7 @@
image: gcc
+tag: run1
+
before_script:
- apt-get update --yes
- apt-get install --yes cmake libboost-dev libeigen3-dev
--
GitLab
From 5e14c9621ba517ba368a7ff4f81c5e68336fa1e8 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Wed, 5 Dec 2018 21:17:39 +0100
Subject: [PATCH 3/7] removed tag
---
.gitlab-ci.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68f143e04..df24116ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,4 @@
-image: gcc
-
-tag: run1
+image: ubuntu:bionic
before_script:
- apt-get update --yes
--
GitLab
From a3110de0ebacc425ea0cbfce73e6f3e859c4830f Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Wed, 5 Dec 2018 21:23:32 +0100
Subject: [PATCH 4/7] added tag
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df24116ae..95c601097 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,8 @@ before_script:
build:
stage: build
+ tags:
+ - run1
script:
- mkdir build
- cd build
--
GitLab
From 318693d714d63349037e7d73611a2135e95bff11 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Wed, 5 Dec 2018 23:49:13 +0100
Subject: [PATCH 5/7] added tag
---
.gitlab-ci.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95c601097..5bf09b587 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,8 @@
image: ubuntu:bionic
+variables:
+ GIT_SSL_NO_VERIFY: "1"
+
before_script:
- apt-get update --yes
- apt-get install --yes cmake libboost-dev libeigen3-dev
--
GitLab
From 744ad05cb1a836c368874324d63901d7fd0ed3fe Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Wed, 5 Dec 2018 23:53:23 +0100
Subject: [PATCH 6/7] added python3
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bf09b587..018ac13d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ variables:
before_script:
- apt-get update --yes
- - apt-get install --yes cmake libboost-dev libeigen3-dev
+ - apt-get install --yes cmake libboost-dev libeigen3-dev python3
build:
stage: build
--
GitLab
From a29cd280f857e8ae6c39879d7556a632249df72b Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Thu, 6 Dec 2018 00:26:51 +0100
Subject: [PATCH 7/7] removed utf8 character
---
Framework/Particles/pdxml_reader.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Framework/Particles/pdxml_reader.py b/Framework/Particles/pdxml_reader.py
index 96d50588b..208bbea3d 100755
--- a/Framework/Particles/pdxml_reader.py
+++ b/Framework/Particles/pdxml_reader.py
@@ -275,7 +275,7 @@ def gen_classes(pythia_db):
string += "/** @class " + cname + "\n\n"
string += " * Particle properties are taken from the PYTHIA8 ParticleData.xml file:<br>\n"
string += " * - pdg=" + str(pythia_db[cname]['pdg']) +"\n"
- string += " * - mass=" + str(pythia_db[cname]['mass']) + " GeV/c² \n"
+ string += " * - mass=" + str(pythia_db[cname]['mass']) + " GeV/c2 \n"
string += " * - charge= " + str(pythia_db[cname]['electric_charge']/3) + " \n"
string += " * - name=" + str(cname) + "\n"
string += " * - anti=" + str(antiP) + "\n"
--
GitLab