From e6fb9b863a58ba6411103955823f1689ed104518 Mon Sep 17 00:00:00 2001
From: Rosanny <rosanny.sihombing@hft-stuttgart.de>
Date: Tue, 13 Jul 2021 14:02:17 +0000
Subject: [PATCH 01/11] update build script
(cherry picked from commit 79550d224dd1cab6a5f2fddc4c3b30faa0b60c49)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 66c67cf..22cc851 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
},
"scripts": {
"start": "nodemon app.ts",
- "build": "tsc --build",
+ "build": "tsc --project ./",
"clean": "tsc --build --clean",
"test": ""
},
--
GitLab
From c0d10f61ea7ad9342a5d1dfc862f074a0ce5827e Mon Sep 17 00:00:00 2001
From: Rosanny <rosanny.sihombing@hft-stuttgart.de>
Date: Tue, 13 Jul 2021 14:05:42 +0000
Subject: [PATCH 02/11] update yml script
(cherry picked from commit 81feae6daa44b089ddaed390f7416fcab5cc8094)
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 265043a..1785bb5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@ pages-testing:
- npm install
- npm run clean
- npm run build
- - rm -R built/views
- - cp -R views built
+ - rm -R ./built/views
+ - cp -R ./views ./built
- cat $configfiledev > ./built/config/config.js
- "pm2 delete --silent project || :"
- pm2 start ./built/app.js --name=project
--
GitLab
From ba8a2310d28a4f73cc30c8dd671800176a4d41b8 Mon Sep 17 00:00:00 2001
From: Rosanny <rosanny.sihombing@hft-stuttgart.de>
Date: Tue, 13 Jul 2021 14:19:20 +0000
Subject: [PATCH 03/11] update build and clean scripts
(cherry picked from commit f6d300eabc71e8933d4bda84078ead5c397c3849)
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 22cc851..69a7598 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
},
"scripts": {
"start": "nodemon app.ts",
- "build": "tsc --project ./",
- "clean": "tsc --build --clean",
+ "build": "tsc -build",
+ "clean": "tsc -build --clean",
"test": ""
},
"dependencies": {
--
GitLab
From c9a6a30d528b2175836efe6ef8e53695c96d442b Mon Sep 17 00:00:00 2001
From: Rosanny <rosanny.sihombing@hft-stuttgart.de>
Date: Wed, 21 Jul 2021 09:13:52 +0000
Subject: [PATCH 04/11] update config
(cherry picked from commit 85cf37281058110cd13ddfc04d651211104e7272)
---
config/config.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config/config.ts b/config/config.ts
index 3d03f56..8463591 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -5,6 +5,7 @@ module.exports = {
port: process.env.PORT || 8888
},
database: {
+ host: 'localhost',
user: 'usernamedb', // DB username
password: 'passworddb', // DB password
port: 3306, // MySQL port
@@ -22,6 +23,7 @@ module.exports = {
port: process.env.PORT || 8888
},
database: {
+ host: 'localhost',
user: 'usernamedb', // DB username
password: 'passworddb', // DB password
port: 3306, // MySQL port
--
GitLab
From 4523da6581b9d1d362c1ff76bb179b9363bc3cd4 Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Wed, 21 Jul 2021 12:49:04 +0000
Subject: [PATCH 05/11] Update .gitlab-ci.yml, -f flag added to rm to omit
clear directory
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1785bb5..b15fcc5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ pages-testing:
- npm install
- npm run clean
- npm run build
- - rm -R ./built/views
+ - rm -rf ./built/views
- cp -R ./views ./built
- cat $configfiledev > ./built/config/config.js
- "pm2 delete --silent project || :"
@@ -26,4 +26,4 @@ pages-production:
tags:
- production
only:
- - master
\ No newline at end of file
+ - master
--
GitLab
From f9d30ef4d1e416aaf3ecea9e168ae66dae3d8c0f Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Wed, 21 Jul 2021 13:57:17 +0000
Subject: [PATCH 06/11] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b15fcc5..7e404e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,14 +2,11 @@ pages-testing:
stage: deploy
script:
- npm install
+ - echo "npm installed"
- npm run clean
+ - echo "npm cleansed"
- npm run build
- - rm -rf ./built/views
- - cp -R ./views ./built
- - cat $configfiledev > ./built/config/config.js
- - "pm2 delete --silent project || :"
- - pm2 start ./built/app.js --name=project
- - pm2 save
+ - echo "npm built"
tags:
- testing
only:
--
GitLab
From ba9944c6c01e73614c8e1ae1dd30bbc55b4b280f Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Wed, 21 Jul 2021 13:58:34 +0000
Subject: [PATCH 07/11] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e404e3..cc4bc73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,8 @@
pages-testing:
stage: deploy
script:
+ - echo "script"
- npm install
- - echo "npm installed"
- - npm run clean
- - echo "npm cleansed"
- - npm run build
- - echo "npm built"
tags:
- testing
only:
--
GitLab
From 0e6d5d672931c6db2003f1851d9a9150de858e91 Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Wed, 21 Jul 2021 14:00:02 +0000
Subject: [PATCH 08/11] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc4bc73..2bc13e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ pages-testing:
stage: deploy
script:
- echo "script"
- - npm install
+ - npm version
tags:
- testing
only:
--
GitLab
From 67debb5b71829f3d1d1703bdbd999a5416202bf6 Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Wed, 21 Jul 2021 14:14:28 +0000
Subject: [PATCH 09/11] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bc13e8..e375b2c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ pages-testing:
stage: deploy
script:
- echo "script"
- - npm version
tags:
- testing
only:
--
GitLab
From 6efb2788cd73dec964bc19fd6343022036cfe359 Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Wed, 21 Jul 2021 14:15:48 +0000
Subject: [PATCH 10/11] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e375b2c..1369f69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ pages-testing:
stage: deploy
script:
- echo "script"
+ - which npm
tags:
- testing
only:
--
GitLab
From 9e75207650b2522a0987e7e93d241cbcb58d6894 Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Wed, 21 Jul 2021 14:17:47 +0000
Subject: [PATCH 11/11] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1369f69..2bc13e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ pages-testing:
stage: deploy
script:
- echo "script"
- - which npm
+ - npm version
tags:
- testing
only:
--
GitLab