From ae3b0c17cddc05581089b75fbaa2b35e89f9862c Mon Sep 17 00:00:00 2001 From: Alexander Onnikov Date: Mon, 29 Jul 2024 18:15:08 +0700 Subject: [PATCH] fix: add github to server pipeline Signed-off-by: Alexander Onnikov --- common/config/rush/pnpm-lock.yaml | 16 ++++++++-------- pods/server/package.json | 6 ------ server/server-pipeline/package.json | 6 +++++- .../server-pipeline/src/internationalization.ts | 3 +++ server/server-pipeline/src/serverPlugins.ts | 2 ++ 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index f8b0b7e4a8..e55639976e 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -23830,7 +23830,7 @@ packages: dev: false file:projects/analytics-service.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2): - resolution: {integrity: sha512-3hpPEwojBH/WARd3evdL3zOnOb9ygsuGRlKmPARpwJx3BV2iI/yapLa2vF7pZUSOZRNK+U3sfYNUGmjMUiV3PA==, tarball: file:projects/analytics-service.tgz} + resolution: {integrity: sha512-CNOxEi0TSwyscgxa3iTdWPASgNS0YwNXfS5L52nmlmi+Y2OH7N4wwOXS0BKyEuqYYkSMsEMArPfB5xYaYoNkJw==, tarball: file:projects/analytics-service.tgz} id: file:projects/analytics-service.tgz name: '@rush-temp/analytics-service' version: 0.0.0 @@ -28496,7 +28496,7 @@ packages: dev: false file:projects/pod-account.tgz: - resolution: {integrity: sha512-yI2LfUu2SCsh/b97mSszloCkfnaZ0s0AllwwszhB5S3V6jJFzAcyhfX2Zw9y2XRbe2UOPMyISs16JrCFDI8Rog==, tarball: file:projects/pod-account.tgz} + resolution: {integrity: sha512-4GzxbT2fBrGb3XHE1U4rRqzn73jrkUyIaWJUsjDzDAYzmOGAUX3n+DplPLC3rPCql58F6XxniPQH25KcmLkkCw==, tarball: file:projects/pod-account.tgz} name: '@rush-temp/pod-account' version: 0.0.0 dependencies: @@ -28589,7 +28589,7 @@ packages: dev: false file:projects/pod-backup.tgz: - resolution: {integrity: sha512-kDZfttPxTuMHKyNcRqOBDuzJjR+H4DGGAFor6GvK4vNDRDHmw0vxFg8zkhDCSLgUAGaHIq/Xw8SxkADO1BKJQQ==, tarball: file:projects/pod-backup.tgz} + resolution: {integrity: sha512-K4zdP793+k9e7WeP7+suiK8gd/vTQftNronVzzMmx5qRRnqNJhqdY6QffMuYPzqEytxwmg+7T8MSfYEwPvlMJw==, tarball: file:projects/pod-backup.tgz} name: '@rush-temp/pod-backup' version: 0.0.0 dependencies: @@ -28686,7 +28686,7 @@ packages: dev: false file:projects/pod-collaborator.tgz: - resolution: {integrity: sha512-3qz7k9xtE0tZjr0MlSs062eI+X4WfPh+anTCA7btPShvsC+5GdSYBXxD5nCT4rO7klt7pCLfXMozSEJrIXTM2Q==, tarball: file:projects/pod-collaborator.tgz} + resolution: {integrity: sha512-ayRiefa0hytLnCUUVac5/YEwko1XSxpudTToOamTBxzFfXlwGdlK6D2gQMN/dNkbTG4Wc9KLzjlwDb4VXUkLmw==, tarball: file:projects/pod-collaborator.tgz} name: '@rush-temp/pod-collaborator' version: 0.0.0 dependencies: @@ -28719,7 +28719,7 @@ packages: dev: false file:projects/pod-front.tgz: - resolution: {integrity: sha512-dfeO6R4HILQ4+Z+sBAH3KAPWLOXtwCQjlaxfD9//EOAyiXBynRyGKJUgudkWm/iG0fpgfxdYogYzg2OyUjKtJg==, tarball: file:projects/pod-front.tgz} + resolution: {integrity: sha512-YkIJf+SF6JuDvwC0ANFW/F/DLjC7M/5vm+aXzIK/CJUnojLex6nCeyDNzLqfl0E3oecLOKz13pRHsDzgNHYAGQ==, tarball: file:projects/pod-front.tgz} name: '@rush-temp/pod-front' version: 0.0.0 dependencies: @@ -28766,7 +28766,7 @@ packages: dev: false file:projects/pod-github.tgz(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-prosemirror@1.2.2): - resolution: {integrity: sha512-WnIupxKJkkE/0F06plCcJxaijJf8mwN80v8tgb1hqkpNOB2BbBWdcDbFk0apeiASq7SiI22r16l7aZA2kAqjig==, tarball: file:projects/pod-github.tgz} + resolution: {integrity: sha512-RA87aZVbfB6BoGlJ19b/c8Hqd6Xc8T0VjxDw/cmrGWVBP5itbg/Vliquag/JsEXrqzRKr/c0WkNWB6lkr4ojSQ==, tarball: file:projects/pod-github.tgz} id: file:projects/pod-github.tgz name: '@rush-temp/pod-github' version: 0.0.0 @@ -29008,7 +29008,7 @@ packages: dev: false file:projects/pod-server.tgz: - resolution: {integrity: sha512-SKYUU6rZD72X+TPRSMr2uaiNrrFE686lm0Ds5ZTObKaPflbXfOua6hR//f4i7YstbNeNMwCTm73OSfkqLsTOXA==, tarball: file:projects/pod-server.tgz} + resolution: {integrity: sha512-XTI4qfulSUmxQELlvipQdb6F4i2MG1uBldX7HHP19oBB7fTn85S/qXQols9NOggFWtgIw5ApT2VdQqiJLqmOGQ==, tarball: file:projects/pod-server.tgz} name: '@rush-temp/pod-server' version: 0.0.0 dependencies: @@ -31450,7 +31450,7 @@ packages: dev: false file:projects/server-pipeline.tgz: - resolution: {integrity: sha512-SmB9+QJy2nEfGizS/BADIxgNsUGf/2T5v08AaDp1gS8FecGNrXwnu8oUUVBmBWVV6n1dEfpGk/CjHYuXC07O3g==, tarball: file:projects/server-pipeline.tgz} + resolution: {integrity: sha512-DpU8h5YS6u+d1uVTSyALfcGof3p2hXuSd8f1RyFI/YvNHxLHLrTu0AzquL8uhwxliB1bpNJtCWh1RWphdVJD4Q==, tarball: file:projects/server-pipeline.tgz} name: '@rush-temp/server-pipeline' version: 0.0.0 dependencies: diff --git a/pods/server/package.json b/pods/server/package.json index a6c37d705e..90214c6c8d 100644 --- a/pods/server/package.json +++ b/pods/server/package.json @@ -66,12 +66,6 @@ "@hcengineering/minio": "^0.6.0", "@hcengineering/openai": "^0.6.0", "@hcengineering/translate": "^0.6.0", - "@hcengineering/server-github": "^0.6.0", - "@hcengineering/server-github-resources": "^0.6.0", - "@hcengineering/github": "^0.6.0", - "@hcengineering/github-assets": "^0.6.0", - "@hcengineering/server-analytics-collector": "^0.6.0", - "@hcengineering/server-analytics-collector-resources": "^0.6.0", "@hcengineering/analytics": "^0.6.0", "@hcengineering/analytics-service": "^0.6.0", "@hcengineering/contact": "^0.6.24", diff --git a/server/server-pipeline/package.json b/server/server-pipeline/package.json index 13c5251cae..b36444b30e 100644 --- a/server/server-pipeline/package.json +++ b/server/server-pipeline/package.json @@ -73,6 +73,8 @@ "@hcengineering/server-tags-resources": "^0.6.0", "@hcengineering/server-calendar": "^0.6.0", "@hcengineering/server-calendar-resources": "^0.6.0", + "@hcengineering/server-github": "^0.6.0", + "@hcengineering/server-github-resources": "^0.6.0", "@hcengineering/server-gmail": "^0.6.0", "@hcengineering/server-gmail-resources": "^0.6.0", "@hcengineering/server-preference": "^0.6.0", @@ -166,6 +168,8 @@ "@hcengineering/server-love-resources": "^0.6.0", "@hcengineering/controlled-documents": "^0.1.0", "@hcengineering/products": "^0.1.0", - "@hcengineering/training": "^0.1.0" + "@hcengineering/training": "^0.1.0", + "@hcengineering/github": "^0.6.0", + "@hcengineering/github-assets": "^0.6.0" } } diff --git a/server/server-pipeline/src/internationalization.ts b/server/server-pipeline/src/internationalization.ts index 0c7d010966..265df55a1a 100644 --- a/server/server-pipeline/src/internationalization.ts +++ b/server/server-pipeline/src/internationalization.ts @@ -10,6 +10,7 @@ import { contactId } from '@hcengineering/contact' import { documentsId } from '@hcengineering/controlled-documents' import { documentId } from '@hcengineering/document' import { driveId } from '@hcengineering/drive' +import { githubId } from '@hcengineering/github' import { gmailId } from '@hcengineering/gmail' import { hrId } from '@hcengineering/hr' import { inventoryId } from '@hcengineering/inventory' @@ -44,6 +45,7 @@ import contactEn from '@hcengineering/contact-assets/lang/en.json' import documentsEn from '@hcengineering/controlled-documents-assets/lang/en.json' import documentEn from '@hcengineering/document-assets/lang/en.json' import driveEn from '@hcengineering/drive-assets/lang/en.json' +import githubEn from '@hcengineering/github-assets/lang/en.json' import gmailEn from '@hcengineering/gmail-assets/lang/en.json' import hrEn from '@hcengineering/hr-assets/lang/en.json' import inventoryEn from '@hcengineering/inventory-assets/lang/en.json' @@ -100,4 +102,5 @@ export function registerStringLoaders (): void { addStringsLoader(documentsId, async (lang: string) => documentsEn) addStringsLoader(productsId, async (lang: string) => productsEn) addStringsLoader(trainingId, async (lang: string) => trainingEn) + addStringsLoader(githubId, async (lang: string) => githubEn) } diff --git a/server/server-pipeline/src/serverPlugins.ts b/server/server-pipeline/src/serverPlugins.ts index f076aa1457..9108f3c0f3 100644 --- a/server/server-pipeline/src/serverPlugins.ts +++ b/server/server-pipeline/src/serverPlugins.ts @@ -9,6 +9,7 @@ import { serverContactId } from '@hcengineering/server-contact' import { serverDocumentsId } from '@hcengineering/server-controlled-documents' import { serverDocumentId } from '@hcengineering/server-document' import { serverDriveId } from '@hcengineering/server-drive' +import { serverGithubId } from '@hcengineering/server-github' import { serverGmailId } from '@hcengineering/server-gmail' import { serverGuestId } from '@hcengineering/server-guest' import { serverHrId } from '@hcengineering/server-hr' @@ -55,4 +56,5 @@ export function registerServerPlugins (): void { addLocation(serverDriveId, () => import('@hcengineering/server-drive-resources')) addLocation(serverDocumentsId, () => import('@hcengineering/server-controlled-documents-resources')) addLocation(serverTrainingId, () => import('@hcengineering/server-training-resources')) + addLocation(serverGithubId, () => import('@hcengineering/server-github-resources')) }