From 86af06556aef380caefb8b1e6ffb747c8f3a7fb2 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 2 Apr 2020 19:06:11 +0200 Subject: [PATCH 1/8] Add npm package checks --- .gitlab-ci.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9ec8d6..4a087b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ include: stages: - build - test + - npm backend: stage: build @@ -51,3 +52,34 @@ backend-unittests: changes: - login_provider/**/* - .gitlab-ci.yml + +audit: + stage: npm + image: node:13-alpine + script: + - cd frontend + - npm audit --audit-level=moderate + allow_failure: true + +upgrade: + stage: npm + #extends: frontend-e2etest + before_script: + - cd frontend + - npm update --dev + script: + - git diff + allow_failure: true + +apply: + stage: npm + script: + - cd frontend + - BRANCH_NAME=npm-update-$(date +%s) + - npm update --dev + - git config user.name "GitLab RUnner" + - git remote set-url http://mark:$GIT_ACCESS_TOKEN@open.greenhost.net/openappstack/user-panel + - git checkout -b $BRANCH_NAME + - git commit -a -m "build(npm) update packages" + - git push origin $BRANCH_NAME -o merge_request.create -o merge_request.target=master + when: manual -- GitLab From b0357838a3f8cab85558d2fe68e7af23ac4b9fa5 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 2 Apr 2020 19:18:15 +0200 Subject: [PATCH 2/8] Fix missing npm and install commands --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a087b7..39b99f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,14 +58,17 @@ audit: image: node:13-alpine script: - cd frontend + - npm install - npm audit --audit-level=moderate allow_failure: true upgrade: stage: npm #extends: frontend-e2etest + image: node:13-alpine before_script: - cd frontend + - npm install - npm update --dev script: - git diff @@ -73,9 +76,11 @@ upgrade: apply: stage: npm + image: node:13-alpine script: - cd frontend - BRANCH_NAME=npm-update-$(date +%s) + - npm install - npm update --dev - git config user.name "GitLab RUnner" - git remote set-url http://mark:$GIT_ACCESS_TOKEN@open.greenhost.net/openappstack/user-panel -- GitLab From 86ec228f91e74c0ca2fb519c5be86bb098977665 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 2 Apr 2020 19:27:06 +0200 Subject: [PATCH 3/8] Add git --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39b99f1..561c8e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,6 +68,7 @@ upgrade: image: node:13-alpine before_script: - cd frontend + - apk add git - npm install - npm update --dev script: @@ -79,6 +80,7 @@ apply: image: node:13-alpine script: - cd frontend + - apk add git - BRANCH_NAME=npm-update-$(date +%s) - npm install - npm update --dev -- GitLab From f486566d82b7ace90667dde5ce9860dcfb2a932a Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 2 Apr 2020 19:39:09 +0200 Subject: [PATCH 4/8] Fix change set-url command --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 561c8e4..22d0dee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,7 +85,7 @@ apply: - npm install - npm update --dev - git config user.name "GitLab RUnner" - - git remote set-url http://mark:$GIT_ACCESS_TOKEN@open.greenhost.net/openappstack/user-panel + - git remote set-url origin https://$GIT_USERNAME:$GIT_ACCESS_TOKEN@open.greenhost.net/openappstack/user-panel - git checkout -b $BRANCH_NAME - git commit -a -m "build(npm) update packages" - git push origin $BRANCH_NAME -o merge_request.create -o merge_request.target=master -- GitLab From 970ce5908e93f84c3b3d139c44d53afa5a3cbd10 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 2 Apr 2020 19:42:13 +0200 Subject: [PATCH 5/8] Change npm audit severity --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22d0dee..68f216e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ audit: script: - cd frontend - npm install - - npm audit --audit-level=moderate + - npm audit --audit-level=low allow_failure: true upgrade: @@ -72,6 +72,8 @@ upgrade: - npm install - npm update --dev script: + - npm install + - npm update --dev - git diff allow_failure: true -- GitLab From 8cf7f6b65d1420dd83ca8c713ec009e4feb25a2d Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 2 Apr 2020 19:43:19 +0200 Subject: [PATCH 6/8] Execute backend test only when backend changes --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68f216e..d885c11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,6 @@ backend: only: changes: - backend/**/* - - .gitlab-ci.yml frontend: stage: build -- GitLab From 1f70d0cf787ce33626c150f8aae3ff841be3ac64 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 2 Apr 2020 20:04:53 +0200 Subject: [PATCH 7/8] Fix npm upgrade process --- .gitlab-ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d885c11..2283761 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,11 +68,11 @@ upgrade: before_script: - cd frontend - apk add git + - npm install -g npm-check-updates + - ncu -u - npm install - - npm update --dev script: - - npm install - - npm update --dev + # remove when this is an extension of frontend-e2e - git diff allow_failure: true @@ -83,9 +83,10 @@ apply: - cd frontend - apk add git - BRANCH_NAME=npm-update-$(date +%s) - - npm install - - npm update --dev - - git config user.name "GitLab RUnner" + - npm install -g npm-check-updates + - ncu -u + - git config user.name "$GIT_USERNAME" + - git config user.email "$GIT_EMAIL" - git remote set-url origin https://$GIT_USERNAME:$GIT_ACCESS_TOKEN@open.greenhost.net/openappstack/user-panel - git checkout -b $BRANCH_NAME - git commit -a -m "build(npm) update packages" -- GitLab From 744a51366eed831d5c09285cd7f8961a837fd0e3 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 2 Apr 2020 18:10:23 +0000 Subject: [PATCH 8/8] build(npm) update packages --- frontend/package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 36edcff..0012b6f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -15,17 +15,17 @@ "homepage": "https://open.greenhost.net/openappstack/user-panel", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { - "@nuxtjs/auth": "^4.8.4", - "@nuxtjs/axios": "^5.6.0", - "bootstrap-vue": "^2.0.3", - "cookie-parser": "^1.4.4", + "@nuxtjs/auth": "^4.9.0", + "@nuxtjs/axios": "^5.9.7", + "bootstrap-vue": "^2.10.0", + "cookie-parser": "^1.4.5", "lokka": "^1.7.0", "lokka-transport-http": "^1.6.1", - "nuxt": "^2.10.2", - "openid-client": "^3.7.3" + "nuxt": "^2.12.2", + "openid-client": "^3.14.1" }, "devDependencies": { - "chromedriver": "^77.0.0", - "nightwatch": "^1.2.4" + "chromedriver": "^80.0.1", + "nightwatch": "^1.3.4" } } -- GitLab