From 3824badebe9d65026d71499326c5e9ba14a20025 Mon Sep 17 00:00:00 2001 From: Julian Waller Date: Tue, 23 Jan 2024 21:54:39 +0000 Subject: [PATCH] chore: rename beta/master branches to main --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .github/workflows/nodejs.yml | 10 +++++----- .github/workflows/sync-modules.yml | 2 +- webui/src/GettingStarted.tsx | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index b977e15bdb..689339703b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -8,7 +8,7 @@ body: attributes: value: | **Make sure you're on the latest bleeding edge build** - *Before you report a bug, make sure you're not reporting something that have been fixed in the master branch by downloading a "latest" build from https://builds.bitfocus.io/companion/* + *Before you report a bug, make sure you're not reporting something that have been fixed in the main branch by downloading a "latest" build from https://builds.bitfocus.io/companion/* **This form is only for bugs related to the Companion software itself. If you are reporting a bug that you feel is limited to a specific Companion module, please make the bug report directly in that module's repository.** Most Repositories can be located within the Bitfocus Github account (https://github.com/bitfocus?type=source) with the following naming convention: companion-module-*manufacturer*-*product* - type: checkboxes diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 9a771cfe68..3aa9d95978 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -93,7 +93,7 @@ jobs: uses: bitfocus/actions/upload-and-notify@main with: long-version: ${{ steps.filenames.outputs.longversion }} - beta-branch: beta + beta-branch: main dev-branch: develop source-filename: ${{ steps.filenames.outputs.sourcename }} @@ -159,7 +159,7 @@ jobs: uses: bitfocus/actions/upload-and-notify@main with: long-version: ${{ steps.filenames.outputs.longversion }} - beta-branch: beta + beta-branch: main dev-branch: develop source-filename: ${{ steps.filenames.outputs.sourcename }} @@ -224,7 +224,7 @@ jobs: uses: bitfocus/actions/upload-and-notify@main with: long-version: ${{ steps.filenames.outputs.longversion }} - beta-branch: beta + beta-branch: main dev-branch: develop source-filename: ${{ steps.filenames.outputs.sourcename }} @@ -293,7 +293,7 @@ jobs: uses: bitfocus/actions/upload-and-notify@main with: long-version: ${{ steps.filenames.outputs.longversion }} - beta-branch: beta + beta-branch: main dev-branch: develop source-filename: ${{ steps.filenames.outputs.sourcename }} @@ -361,7 +361,7 @@ jobs: uses: bitfocus/actions/upload-and-notify@main with: long-version: ${{ steps.filenames.outputs.longversion }} - beta-branch: beta + beta-branch: main dev-branch: develop source-filename: ${{ steps.filenames.outputs.sourcename }} diff --git a/.github/workflows/sync-modules.yml b/.github/workflows/sync-modules.yml index fdc2eb15a4..549bd8f2db 100644 --- a/.github/workflows/sync-modules.yml +++ b/.github/workflows/sync-modules.yml @@ -8,7 +8,7 @@ on: env: MODULES_BRANCH: main - COMPANION_BRANCH: beta + COMPANION_BRANCH: main jobs: sync-modules: diff --git a/webui/src/GettingStarted.tsx b/webui/src/GettingStarted.tsx index 8292e5cafa..5f3c79f6f1 100644 --- a/webui/src/GettingStarted.tsx +++ b/webui/src/GettingStarted.tsx @@ -216,7 +216,7 @@ function RenderSubsection({ subsect, setVisibleFiles, visibleFiles }: RenderSubs {subsect.label}