diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 252835b31..f9ba9b39b 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -3,9 +3,8 @@ name: Run tests and package firmware on: push: branches: - - '2.4' - - '2.5' - '2.6' + - '2.7' - 'main' tags: - v* @@ -17,9 +16,8 @@ on: - '.devcontainer/**' pull_request: branches: - - '2.4' - - '2.5' - '2.6' + - '2.7' - 'main' paths-ignore: - '**.md' diff --git a/.github/workflows/linux_cpn.yml b/.github/workflows/linux_cpn.yml index d20adfead..3faf8d28f 100644 --- a/.github/workflows/linux_cpn.yml +++ b/.github/workflows/linux_cpn.yml @@ -3,8 +3,8 @@ name: Linux Companion on: push: branches: - - '2.5' - '2.6' + - '2.7' - 'main' tags: - v* @@ -15,8 +15,8 @@ on: pull_request: branches: - - '2.5' - '2.6' + - '2.7' - 'main' paths: - '.github/workflows/linux_cpn.yml' diff --git a/.github/workflows/macosx_cpn.yml b/.github/workflows/macosx_cpn.yml index abd1eb424..362c362c7 100644 --- a/.github/workflows/macosx_cpn.yml +++ b/.github/workflows/macosx_cpn.yml @@ -3,8 +3,8 @@ name: MacOSX Companion on: push: branches: - - '2.5' - '2.6' + - '2.7' - 'main' tags: - v* @@ -15,8 +15,8 @@ on: pull_request: branches: - - '2.5' - '2.6' + - '2.7' - 'main' paths: - '.github/workflows/macosx_cpn.yml' diff --git a/.github/workflows/win_cpn.yml b/.github/workflows/win_cpn.yml index d0702796b..9e9e2ee39 100644 --- a/.github/workflows/win_cpn.yml +++ b/.github/workflows/win_cpn.yml @@ -3,8 +3,8 @@ name: Windows Companion on: push: branches: - - '2.5' - '2.6' + - '2.7' - 'main' tags: - v* @@ -15,8 +15,8 @@ on: pull_request: branches: - - '2.5' - '2.6' + - '2.7' - 'main' paths: - '.github/workflows/win_cpn.yml' diff --git a/CMakeLists.txt b/CMakeLists.txt index c9cd491e1..3808964f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ project(EdgeTX) set(VERSION_MAJOR "2") -set(VERSION_MINOR "7") +set(VERSION_MINOR "8") set(VERSION_REVISION "0") set(CODENAME "dev") set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})