From 297c276962cc72115862ff102c3af04d34262fa7 Mon Sep 17 00:00:00 2001
From: Jonas Schwab <jonas.schwab@physik.uni-wuerzburg.de>
Date: Tue, 28 Jul 2020 13:23:14 +0200
Subject: [PATCH 1/4] Let configure.sh create Makefile with environment
 variables

---
 .gitignore                   | 2 +-
 Makefile => MakefileTemplate | 0
 configure.sh                 | 7 +++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 rename Makefile => MakefileTemplate (100%)

diff --git a/.gitignore b/.gitignore
index 65e6b451..11ff982a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ Test_*
 ALF_Doxygen_*
 Doxygen_Docu/*
 Analysis/cov_tau_ph.F90
-environment
+Makefile
diff --git a/Makefile b/MakefileTemplate
similarity index 100%
rename from Makefile
rename to MakefileTemplate
diff --git a/configure.sh b/configure.sh
index b524a05e..28579143 100755
--- a/configure.sh
+++ b/configure.sh
@@ -272,4 +272,11 @@ export ALF_FLAGS_MODULES
 export ALF_FLAGS_ANA
 export ALF_FLAGS_PROG
 
+env | awk '{print "export " $0}' > Makefile
+sed -i '/BASH_FUNC.*%%=()/d' Makefile
+sed -i '/}$/d' Makefile
+printf "\n" >> Makefile
+cat MakefileTemplate >> Makefile
+
 printf "\nTo compile your program use:    'make TARGET'\n\n"
+
-- 
GitLab


From d6e8ff6951c08d8a1db1878246703b2107f649b6 Mon Sep 17 00:00:00 2001
From: Jonas Schwab <jonas.schwab@physik.uni-wuerzburg.de>
Date: Tue, 28 Jul 2020 13:24:56 +0200
Subject: [PATCH 2/4] Pipeline: Do not source but execute configure.sh

---
 .gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f490e135..6275f24d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ stages:
   stage: build
   <<: *exemptfiles_definition
   script:
-    - . configure.sh GNU serial
+    - ./configure.sh GNU serial
     - gfortran -v
     - make all
 
@@ -26,14 +26,14 @@ stages:
   script:
     - export PATH="/opt/pgi/linux86-64/2016/bin:$PATH"
     - pgfortran --version
-    - . configure.sh PGI serial
+    - ./configure.sh PGI serial
     - make all
 
 .warnconv_template: &warnconv_definition
   stage: warnconv
   <<: *exemptfiles_definition
   script:
-    - . configure.sh Devel serial
+    - ./configure.sh Devel serial
     - gfortran -v
     - make all
 
@@ -41,7 +41,7 @@ stages:
   stage: test
   <<: *exemptfiles_definition
   script:
-    - . configure.sh Devel serial
+    - ./configure.sh Devel serial
     - gfortran -v
     - make lib
     - make ana
@@ -113,7 +113,7 @@ GQMCT_Stretch_MPI:
       - license.*
   script:
     - gfortran -v
-    - . configure.sh Devel Tempering
+    - ./configure.sh Devel Tempering
     - export ALF_FC="mpif90"
     - make all
 
@@ -161,7 +161,7 @@ GQMCT_Jessie-PGI_conv:
   script:
     - export PATH="/opt/pgi/linux86-64/2017/bin:$PATH"
     - pgfortran --version
-    - . configure.sh PGI serial
+    - ./configure.sh PGI serial
     - make all
 
 GQMCT_Jessie_tests:
@@ -216,7 +216,7 @@ GQMCT_Jessie-PGI_tests:
   script:
     - export PATH="/opt/pgi/linux86-64/2016/bin:$PATH"
     - pgfortran --version
-    - . configure.sh PGI serial
+    - ./configure.sh PGI serial
     - make lib
     - make ana
     - make Examples
@@ -237,7 +237,7 @@ GQMCT_Stretch_valgrind:
       - Libraries/Modules/*.(f|F)90
   script:
       - export ALF_FLAGS_EXT="-g"
-      - . configure.sh Devel serial
+      - ./configure.sh Devel serial
       - gfortran -v
       - make lib
       - make Examples
-- 
GitLab


From 7a8adef355e3c22389a72c686ffe32d14af51293 Mon Sep 17 00:00:00 2001
From: Jonas Schwab <jonas.schwab@physik.uni-wuerzburg.de>
Date: Tue, 28 Jul 2020 13:36:33 +0200
Subject: [PATCH 3/4] Small change to trigger pipeline

---
 Prog/main.F90 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Prog/main.F90 b/Prog/main.F90
index b4e9702a..91688bca 100644
--- a/Prog/main.F90
+++ b/Prog/main.F90
@@ -713,3 +713,4 @@ Program Main
 #endif
         
       end Program Main
+
-- 
GitLab


From cda90c22f7e87dba32fa43454a6741325fd2221f Mon Sep 17 00:00:00 2001
From: Jonas Schwab <jonas.schwab@physik.uni-wuerzburg.de>
Date: Tue, 28 Jul 2020 13:47:03 +0200
Subject: [PATCH 4/4] regex in configure.sh more specific

---
 configure.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.sh b/configure.sh
index 28579143..e181b437 100755
--- a/configure.sh
+++ b/configure.sh
@@ -273,8 +273,8 @@ export ALF_FLAGS_ANA
 export ALF_FLAGS_PROG
 
 env | awk '{print "export " $0}' > Makefile
-sed -i '/BASH_FUNC.*%%=()/d' Makefile
-sed -i '/}$/d' Makefile
+sed -i '/^export BASH_FUNC.*%%=()/d' Makefile
+sed -i '/^export }$/d' Makefile
 printf "\n" >> Makefile
 cat MakefileTemplate >> Makefile
 
-- 
GitLab