From f869f3df764119a4eefea1a19686759e7e080d1c Mon Sep 17 00:00:00 2001 From: tt2468 Date: Fri, 13 May 2022 18:44:53 -0700 Subject: [PATCH] CI: Update to new branch name for release --- .github/pull_request_template.md | 2 +- .github/workflows/generate_docs.yml | 54 ++++++++++++++--------------- .github/workflows/lint.yml | 4 +-- .github/workflows/main.yml | 4 +-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 59b0c205..a1854c4c 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -29,6 +29,6 @@ Tested OS(s): - [ ] I have read the [Contributing Guidelines](https://github.com/obsproject/obs-websocket/wiki/Contributing-Guidelines). - [ ] All commit messages are properly formatted and commits squashed where appropriate. -- [ ] My code is not on the `master` branch. +- [ ] My code is not on the `master` or a `release/*` branch. - [ ] The code has been tested. - [ ] I have included updates to all appropriate documentation. diff --git a/.github/workflows/generate_docs.yml b/.github/workflows/generate_docs.yml index 5ca7d06d..a6f7d55d 100644 --- a/.github/workflows/generate_docs.yml +++ b/.github/workflows/generate_docs.yml @@ -1,27 +1,27 @@ -name: 'Generate docs' - -on: - push: - paths-ignore: - - 'docs/generated/**' - branches: - - master - -jobs: - docs-build: - name: 'Generate docs [Ubuntu]' - runs-on: ubuntu-latest - if: ${{ github.ref == 'refs/heads/master' }} - env: - CHECKOUT_REF: ${{ github.ref }} - GH_TOKEN: ${{ github.token }} - IS_CI: "true" - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - with: - path: ${{ github.workspace }}/obs-websocket - - name: 'Generate docs' - working-directory: ${{ github.workspace }}/obs-websocket - run: | - ./CI/generate-docs.sh +name: 'Generate docs' + +on: + push: + paths-ignore: + - 'docs/generated/**' + branches: + - release/5.0.0 + +jobs: + docs-build: + name: 'Generate docs [Ubuntu]' + runs-on: ubuntu-latest + if: ${{ github.ref == 'refs/heads/master' }} + env: + CHECKOUT_REF: ${{ github.ref }} + GH_TOKEN: ${{ github.token }} + IS_CI: "true" + steps: + - name: 'Checkout' + uses: actions/checkout@v2 + with: + path: ${{ github.workspace }}/obs-websocket + - name: 'Generate docs' + working-directory: ${{ github.workspace }}/obs-websocket + run: | + ./CI/generate-docs.sh diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 81edecc2..b8b5ad7a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,10 +3,10 @@ name: Code Quality on: push: branches: - - master + - release/5.0.0 pull_request: branches: - - master + - release/5.0.0 jobs: markdown: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0068dac2..dea39c87 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ on: paths-ignore: - 'docs/**' branches: - - master + - release/5.0.0 tags: - '[45].[0-9]+.[0-9]+*' pull_request: @@ -13,7 +13,7 @@ on: - 'docs/**' - '**.md' branches: - - master + - release/5.0.0 jobs: windows: