master -> develop

This commit is contained in:
Gabe Kangas 2021-04-11 19:50:47 -07:00
parent 1b27d0b46d
commit 0b6c827557
6 changed files with 9 additions and 9 deletions

View file

@ -3,9 +3,9 @@ name: Automated end to end tests
on: on:
push: push:
# branches: # branches:
# - master # - develop
pull_request: pull_request:
branches: master branches: develop
jobs: jobs:
Jest: Jest:

View file

@ -13,10 +13,10 @@ name: "CodeQL"
on: on:
push: push:
branches: [ master ] branches: [ develop ]
pull_request: pull_request:
# The branches below must be a subset of the branches above # The branches below must be a subset of the branches above
branches: [ master ] branches: [ develop ]
schedule: schedule:
- cron: '36 7 * * 4' - cron: '36 7 * * 4'

View file

@ -4,7 +4,7 @@ name: Format Javascript
on: on:
push: push:
branches: branches:
- master - develop
jobs: jobs:
prettier: prettier:

View file

@ -3,9 +3,9 @@ name: Tests
on: on:
push: push:
branches: branches:
- master - develop
pull_request: pull_request:
branches: master branches: develop
jobs: jobs:
test: test:

View file

@ -4,7 +4,7 @@ import "path/filepath"
const ( const (
// StaticVersionNumber is the version of Owncast that is used when it's not overwritten via build-time settings. // 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 is the web server root directory.
WebRoot = "webroot" WebRoot = "webroot"
// PrivateHLSStoragePath is the HLS write directory. // PrivateHLSStoragePath is the HLS write directory.

View file

@ -1,7 +1,7 @@
openapi: 3.0.1 openapi: 3.0.1
info: info:
title: Owncast 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' version: '0.0.7-dev'
contact: contact:
name: Gabe Kangas name: Gabe Kangas