AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/Bug_report.md vendored
View File

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

2
.github/workflows/docker.yml vendored
View File

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

2
.github/workflows/integration_tests.yml vendored
View File

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

2
.github/workflows/linters.yml vendored
View File

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

2
.github/workflows/unit_tests.yml vendored
View File

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

4
Makefile
View File

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

4
README.md
View File

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

2
app/Core/Plugin/Version.php
View File

@ -19,7 +19,7 @@ class Version
*/ */
public static function isCompatible($pluginCompatibleVersion, $appVersion = APP_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; return true;
} }

4
app/functions.php
View File

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

2
tests/integration/AppProcedureTest.php
View File

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