Stop killing peertube in ci script

diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
index 2ab9f47390db618455449ca5543fa4e81069ce4f..c2a31828590323858ab18c5d30d1b86cd0ba7492 100644 (file)
--- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@a
 import { AuthService, ConfirmService, Notifier, ScreenService } from '@app/core'
 import { BlocklistService, VideoBlockComponent, VideoBlockService, VideoReportComponent } from '@app/shared/shared-moderation'
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
-import { UserRight, VideoCaption, VideoState } from '@shared/models'
+import { VideoCaption } from '@shared/models'
 import {
   Actor,
   DropdownAction,

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 2cb3b96db74570ce24a233f71c62d9808f674d40..a628cbcedb34e4832df075fa67dc97e670a11bb5 100755 (executable)
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -7,8 +7,6 @@ if [ $# -eq 0 ]; then
     exit -1
 fi
 
-killall -q peertube || true
-
 retries=3
 
 runTest () {

diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index c49df1d5e168f2fc572662caf74a163198b3e862..1050463d20dd7dba28c4a8f03364efd0c9e47891 100644 (file)
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -33,7 +33,7 @@ import { getHLSDirectory, getHLSRedundancyDirectory } from '@server/lib/paths'
 import { VideoPathManager } from '@server/lib/video-path-manager'
 import { getServerActor } from '@server/models/application/application'
 import { ModelCache } from '@server/models/model-cache'
-import { AttributesOnly, buildVideoEmbedPath, buildVideoWatchPath, isThisWeek, pick } from '@shared/core-utils'
+import { AttributesOnly, buildVideoEmbedPath, buildVideoWatchPath, pick } from '@shared/core-utils'
 import { VideoFile, VideoInclude } from '@shared/models'
 import { ResultList, UserRight, VideoPrivacy, VideoState } from '../../../shared'
 import { VideoObject } from '../../../shared/models/activitypub/objects'