diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0081c9..c77337e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - build - deploy + - test develop-build-job: stage: build @@ -48,3 +49,12 @@ deploy-job: - ssh -p "$Live_Server_Access_Port" "$Live_Server_User"@"$Live_Server_IP" "rm -Rf /var/www/html/inkletblot-com_old && mv /var/www/html/inkletblot-com /var/www/html/inkletblot-com_old && mkdir /var/www/html/inkletblot-com_build && mkdir /var/www/html/inkletblot-com && tar zxf /var/www/html/inkletblot-com.tar.gz -C /var/www/html/inkletblot-com_build && mv /var/www/html/inkletblot-com_build/dist/inkletblot-com/* /var/www/html/inkletblot-com && rm -Rf /var/www/html/inkletblot-com_build && chmod -R 755 /var/www/html/inkletblot-com && exit" only: - master + +test: + stage: test + tags: + - node + script: + - echo "I don't care about standard merges into dev as a build has to happen for a merge into master, I don't think there is a way to specify that so I need this here." + only: + - merge_requests diff --git a/src/app/shared/models/links.model.ts b/src/app/shared/models/links.model.ts index e11796f..b6f7547 100644 --- a/src/app/shared/models/links.model.ts +++ b/src/app/shared/models/links.model.ts @@ -15,14 +15,6 @@ export const Links: Array = name: "gitlab", location: "https://gitlab.inkletblot.com/" }, - { - name: "forum", - location: "https://www.inkletblot.com/forum/" - }, - { - name: "books", - location: "https://www.inkletblot.com/books/" - }, { name: "known", location: "https://www.inkletblot.com/known/" @@ -31,20 +23,28 @@ export const Links: Array = name: "tng", location: "https://www.inkletblot.com/tng/" }, - { - name: "pico", - location: "https://www.inkletblot.com/pico/" - }, { name: "pasty", location: "https://www.inkletblot.com/pasty/" }, { name: "mail", - location: "https://www.inkletblot.com/webmail/" + location: "https://mail.inkletblot.com/" }, { name: "chk", location: "https://www.chkseven.com" + }, + { + name: "pve", + location: "https://pve.inkletblot.com:8006/" + }, + { + name: "bitwarden", + location: "https://bw.inkletblot.com/" + }, + { + name: "matrix", + location: "https://homeserver.inkletblot.com/" } ] \ No newline at end of file