diff --git a/.github/workflows/automated-end-to-end.yaml b/.github/workflows/automated-end-to-end.yaml index b60d316b3..823dadb09 100644 --- a/.github/workflows/automated-end-to-end.yaml +++ b/.github/workflows/automated-end-to-end.yaml @@ -3,9 +3,9 @@ name: Automated end to end tests on: push: # branches: - # - master + # - develop pull_request: - branches: master + branches: develop jobs: Jest: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c81cbadb1..99fd56e6c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ develop ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ develop ] schedule: - cron: '36 7 * * 4' diff --git a/.github/workflows/javascript-formatting.yml b/.github/workflows/javascript-formatting.yml index d32efadbc..b740dd296 100644 --- a/.github/workflows/javascript-formatting.yml +++ b/.github/workflows/javascript-formatting.yml @@ -4,7 +4,7 @@ name: Format Javascript on: push: branches: - - master + - develop jobs: prettier: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f4cb0e8bf..2a8964f29 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -3,9 +3,9 @@ name: Tests on: push: branches: - - master + - develop pull_request: - branches: master + branches: develop jobs: test: diff --git a/config/constants.go b/config/constants.go index 885f74d94..a2a8c78a2 100644 --- a/config/constants.go +++ b/config/constants.go @@ -4,7 +4,7 @@ import "path/filepath" const ( // StaticVersionNumber is the version of Owncast that is used when it's not overwritten via build-time settings. - StaticVersionNumber = "0.0.7" // Shown when you build from master + StaticVersionNumber = "0.0.7" // Shown when you build from develop // WebRoot is the web server root directory. WebRoot = "webroot" // PrivateHLSStoragePath is the HLS write directory. diff --git a/openapi.yaml b/openapi.yaml index f029bc2fb..2fb7419cf 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Owncast - description: Owncast is a self-hosted live video and web chat server for use with existing popular broadcasting software. The following APIs represent the state in the development master branch. + description: Owncast is a self-hosted live video and web chat server for use with existing popular broadcasting software. The following APIs represent the state in the development branch. version: '0.0.7-dev' contact: name: Gabe Kangas