Merge branch 'master' into stable24

old_stable24
Varun Patil 2022-11-10 22:22:45 -08:00
commit 10cdc55081
2 changed files with 16 additions and 25 deletions

View File

@ -5,18 +5,6 @@ on:
- pull_request - pull_request
jobs: jobs:
xml-linters:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- name: Download schema
run: wget https://apps.nextcloud.com/schema/apps/info.xsd
- name: Lint info.xml
uses: ChristophWurst/xmllint-action@v1
with:
xml-file: ./appinfo/info.xml
xml-schema-file: ./info.xsd
php-cs-fixer: php-cs-fixer:
name: PHP-CS-Fixer name: PHP-CS-Fixer
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@ -8,19 +8,22 @@ use OCP\IConfig;
use OCP\Migration\IOutput; use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep; use OCP\Migration\IRepairStep;
class Repair implements IRepairStep { class Repair implements IRepairStep
{
protected IConfig $config; protected IConfig $config;
public function __construct(IConfig $config) { public function __construct(IConfig $config)
{
$this->config = $config; $this->config = $config;
} }
public function getName(): string { public function getName(): string
{
return 'Repair steps for Memories'; return 'Repair steps for Memories';
} }
public function run(IOutput $output): void { public function run(IOutput $output): void
{
// kill any instances of go-transcode and go-vod // kill any instances of go-transcode and go-vod
shell_exec('pkill go-transcode'); shell_exec('pkill go-transcode');
shell_exec('pkill go-vod'); shell_exec('pkill go-vod');