Rename default branch from master to main

This commit is contained in:
Frédéric Guillot 2022-08-11 20:49:37 -07:00 committed by Frédéric Guillot
parent ce6c4dfc67
commit b433519686
10 changed files with 13 additions and 13 deletions

View File

@ -36,7 +36,7 @@ assignees: ''
### Configuration
- Kanboard version: <!-- provide exact version (not master) -->
- Kanboard version: <!-- provide exact version (not master or main) -->
- Database type and version:
- PHP version:
- OS:

View File

@ -16,7 +16,7 @@ jobs:
id: docker_tag
run: |
SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`
APP_VERSION="master.${SHORT_SHA}"
APP_VERSION="main.${SHORT_SHA}"
DOCKER_IMAGE=kanboard/kanboard
DOCKER_VERSION=dev
if [ "${{ github.event_name }}" = "schedule" ]; then

View File

@ -2,7 +2,7 @@ name: Integration Tests
on:
pull_request:
branches: [ master ]
branches: [ main ]
jobs:
Sqlite:

View File

@ -2,7 +2,7 @@ name: Linters
on:
pull_request:
branches: [ master ]
branches: [ main ]
jobs:
jshint:

View File

@ -2,7 +2,7 @@ name: Unit Tests
on:
pull_request:
branches: [ master ]
branches: [ main ]
jobs:
Sqlite:

View File

@ -1,5 +1,5 @@
DOCKER_IMAGE := docker.io/kanboard/kanboard
DOCKER_TAG := master
DOCKER_TAG := main
VERSION := $(shell git rev-parse --short HEAD)
.PHONY: archive test-sqlite test-mysql test-postgres sql \
@ -46,7 +46,7 @@ docker-images:
docker buildx build \
--platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 \
--file Dockerfile \
--build-arg VERSION=master.$(VERSION) \
--build-arg VERSION=main.$(VERSION) \
--tag $(DOCKER_IMAGE):$(VERSION) \
.

View File

@ -9,7 +9,7 @@ Pull-requests are still accepted as long as the [guidelines](.github/pull_reques
- Official website: <https://kanboard.org/>
- [List of features](https://kanboard.org/#features)
- [Change Log](https://github.com/kanboard/kanboard/blob/master/ChangeLog)
- [Change Log](https://github.com/kanboard/kanboard/blob/main/ChangeLog)
- [Forum](https://kanboard.discourse.group/)
- Official documentation: <https://docs.kanboard.org/>
- [Requirements](https://docs.kanboard.org/en/latest/admin_guide/requirements.html)
@ -22,4 +22,4 @@ Credits
- Main developer: Frédéric Guillot
- [Contributors](https://github.com/kanboard/kanboard/graphs/contributors)
- Distributed under [MIT License](https://github.com/kanboard/kanboard/blob/master/LICENSE)
- Distributed under [MIT License](https://github.com/kanboard/kanboard/blob/main/LICENSE)

View File

@ -19,7 +19,7 @@ class Version
*/
public static function isCompatible($pluginCompatibleVersion, $appVersion = APP_VERSION)
{
if (strpos($appVersion, 'master') !== false) {
if (strpos($appVersion, 'master') !== false || strpos($appVersion, 'main') !== false) {
return true;
}

View File

@ -197,12 +197,12 @@ function build_app_version($ref, $commit_hash)
}
if ($commit_hash !== '$Format:%H$') {
return 'master.'.$commit_hash;
return 'main.'.$commit_hash;
} else if (file_exists('/version.txt')) {
return rtrim(file_get_contents('/version.txt'));
}
return 'master.unknown_revision';
return 'main.unknown_revision';
}
/**

View File

@ -11,7 +11,7 @@ class AppProcedureTest extends BaseProcedureTest
public function testGetVersion()
{
$this->assertEquals('master.unknown_revision', $this->app->getVersion());
$this->assertEquals('main.unknown_revision', $this->app->getVersion());
}
public function testGetApplicationRoles()