From 53e6d051e0c598537c8b2522e7870a4c17220090 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Fri, 17 Dec 2021 15:57:58 +0100 Subject: Rename `master` references to `main` Signed-off-by: Christoph Wurst --- .github/workflows/dependabot-approve-merge.yml | 2 +- .github/workflows/lint-eslint.yml | 2 +- .github/workflows/lint-info-xml.yml | 2 +- .github/workflows/lint-php-cs.yml | 2 +- .github/workflows/lint-php.yml | 2 +- .github/workflows/lint-stylelint.yml | 2 +- .github/workflows/node.yml | 2 +- .github/workflows/phpunit.yml | 12 ++++++------ appinfo/info.xml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 6c5d7373..53ccf2ca 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -8,7 +8,7 @@ name: Dependabot on: pull_request_target: branches: - - master + - main - stable* jobs: diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml index 11590ffb..f2743973 100644 --- a/.github/workflows/lint-eslint.yml +++ b/.github/workflows/lint-eslint.yml @@ -9,7 +9,7 @@ on: pull_request: push: branches: - - master + - main - stable* jobs: diff --git a/.github/workflows/lint-info-xml.yml b/.github/workflows/lint-info-xml.yml index cea2a2bc..31379b79 100644 --- a/.github/workflows/lint-info-xml.yml +++ b/.github/workflows/lint-info-xml.yml @@ -9,7 +9,7 @@ on: pull_request: push: branches: - - master + - main - stable* jobs: diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index 9aad5140..494d778e 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -9,7 +9,7 @@ on: pull_request: push: branches: - - master + - main - stable* jobs: diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index 3e8bac9b..943e80b8 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -9,7 +9,7 @@ on: pull_request: push: branches: - - master + - main - stable* jobs: diff --git a/.github/workflows/lint-stylelint.yml b/.github/workflows/lint-stylelint.yml index 64edcfba..033c72a6 100644 --- a/.github/workflows/lint-stylelint.yml +++ b/.github/workflows/lint-stylelint.yml @@ -9,7 +9,7 @@ on: pull_request: push: branches: - - master + - main - stable* jobs: diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index 4b20eb5e..eee1bb13 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -9,7 +9,7 @@ on: pull_request: push: branches: - - master + - main - stable* jobs: diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 552c4ce0..b21a74e4 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - stable* env: @@ -21,7 +21,7 @@ jobs: php-versions: ['7.4'] databases: ['sqlite'] server-versions: ['stable22', 'stable23', 'master'] - + name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} steps: @@ -53,7 +53,7 @@ jobs: DB_PORT: 4444 run: | mkdir data - ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password + ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password ./occ app:enable --force ${{ env.APP_NAME }} php -S localhost:8080 & @@ -123,7 +123,7 @@ jobs: DB_PORT: 4444 run: | mkdir data - ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password + ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password ./occ app:enable --force ${{ env.APP_NAME }} php -S localhost:8080 & @@ -145,7 +145,7 @@ jobs: php-versions: ['7.4'] databases: ['pgsql'] server-versions: ['stable22', 'stable23', 'master'] - + name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} services: @@ -189,7 +189,7 @@ jobs: DB_PORT: 4444 run: | mkdir data - ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password + ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password ./occ app:enable --force ${{ env.APP_NAME }} php -S localhost:8080 & diff --git a/appinfo/info.xml b/appinfo/info.xml index 14645f4e..408c3aa9 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -35,7 +35,7 @@ https://github.com/nextcloud/contacts#readme https://github.com/nextcloud/contacts/issues https://github.com/nextcloud/contacts.git - https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png + https://raw.githubusercontent.com/nextcloud/screenshots/main/apps/Contacts/contacts.png -- cgit v1.2.3