From 98846837ebb6bfbed3866eee5258946b35769651 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 18 Nov 2021 15:22:53 +0100 Subject: [PATCH] Stop killing peertube in ci script --- .../shared-video-miniature/video-actions-dropdown.component.ts | 2 +- scripts/ci.sh | 2 -- server/models/video/video.ts | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) 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 2ab9f4739..c2a318285 100644 --- 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 2cb3b96db..a628cbced 100755 --- 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 c49df1d5e..1050463d2 100644 --- 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' -- 2.41.0