Merge pull request #1634 from greatscottgadgets/release
Some checks failed
Build / host (3.10.0, map[os:ubuntu shell:bash]) (push) Failing after 8s
Build / host (3.16.0, map[os:ubuntu shell:bash]) (push) Failing after 8s
Build / host (3.21.0, map[os:ubuntu shell:bash]) (push) Failing after 12s
Build / host (4.0.0, map[os:ubuntu shell:bash]) (push) Failing after 12s
Build / host (latest, map[os:ubuntu shell:bash]) (push) Failing after 11s
Build / firmware (HACKRF_ONE, 3.10.0, ubuntu) (push) Failing after 9s
Build / firmware (HACKRF_ONE, latest, ubuntu) (push) Failing after 10s
Build / firmware (JAWBREAKER, 3.10.0, ubuntu) (push) Failing after 6s
Build / firmware (JAWBREAKER, latest, ubuntu) (push) Failing after 4s
Build / firmware (PRALINE, 3.10.0, ubuntu) (push) Failing after 5s
Build / firmware (PRALINE, latest, ubuntu) (push) Failing after 4s
Build / firmware (RAD1O, latest, ubuntu) (push) Failing after 3s
Build / firmware (RAD1O, 3.10.0, ubuntu) (push) Failing after 5s
Check code style / clang-format (push) Failing after 5s
Check code style / clang-format-1 (push) Failing after 3s
Check code style / clang-format-2 (push) Failing after 4s
Check code style / clang-format-3 (push) Failing after 4s
Build / host (latest, map[os:macos shell:bash]) (push) Has been cancelled
Build / firmware (HACKRF_ONE, 3.10.0, macos) (push) Has been cancelled
Build / firmware (HACKRF_ONE, latest, macos) (push) Has been cancelled
Build / firmware (HACKRF_ONE, latest, windows) (push) Has been cancelled
Build / firmware (JAWBREAKER, 3.10.0, macos) (push) Has been cancelled
Build / firmware (JAWBREAKER, latest, macos) (push) Has been cancelled
Build / firmware (PRALINE, latest, macos) (push) Has been cancelled
Build / firmware (JAWBREAKER, latest, windows) (push) Has been cancelled
Build / firmware (PRALINE, 3.10.0, macos) (push) Has been cancelled
Build / firmware (PRALINE, latest, windows) (push) Has been cancelled
Build / firmware (RAD1O, 3.10.0, macos) (push) Has been cancelled
Build / firmware (RAD1O, latest, macos) (push) Has been cancelled
Build / firmware (RAD1O, latest, windows) (push) Has been cancelled
Build / host (3.21.0, -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --install-prefix=$env:GITHUB_WORKSPACE/install, map[os:windows shell:pwsh]) (push) Has been cancelled
Build / host (3.21.0, map[os:macos shell:bash]) (push) Has been cancelled
Build / host (3.10.0, map[os:macos shell:bash]) (push) Has been cancelled
Build / host (3.16.0, map[os:macos shell:bash]) (push) Has been cancelled
Build / host (4.0.0, -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --install-prefix=$env:GITHUB_WORKSPACE/install, map[os:windows shell:pwsh]) (push) Has been cancelled
Build / host (4.0.0, map[os:macos shell:bash]) (push) Has been cancelled
Build / host (latest, --install-prefix=/usr/local, map[os:windows shell:msys2]) (push) Has been cancelled
Build / host (latest, -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --install-prefix=$env:GITHUB_WORKSPACE/install, map[os:windows shell:pwsh]) (push) Has been cancelled
Some checks failed
Build / host (3.10.0, map[os:ubuntu shell:bash]) (push) Failing after 8s
Build / host (3.16.0, map[os:ubuntu shell:bash]) (push) Failing after 8s
Build / host (3.21.0, map[os:ubuntu shell:bash]) (push) Failing after 12s
Build / host (4.0.0, map[os:ubuntu shell:bash]) (push) Failing after 12s
Build / host (latest, map[os:ubuntu shell:bash]) (push) Failing after 11s
Build / firmware (HACKRF_ONE, 3.10.0, ubuntu) (push) Failing after 9s
Build / firmware (HACKRF_ONE, latest, ubuntu) (push) Failing after 10s
Build / firmware (JAWBREAKER, 3.10.0, ubuntu) (push) Failing after 6s
Build / firmware (JAWBREAKER, latest, ubuntu) (push) Failing after 4s
Build / firmware (PRALINE, 3.10.0, ubuntu) (push) Failing after 5s
Build / firmware (PRALINE, latest, ubuntu) (push) Failing after 4s
Build / firmware (RAD1O, latest, ubuntu) (push) Failing after 3s
Build / firmware (RAD1O, 3.10.0, ubuntu) (push) Failing after 5s
Check code style / clang-format (push) Failing after 5s
Check code style / clang-format-1 (push) Failing after 3s
Check code style / clang-format-2 (push) Failing after 4s
Check code style / clang-format-3 (push) Failing after 4s
Build / host (latest, map[os:macos shell:bash]) (push) Has been cancelled
Build / firmware (HACKRF_ONE, 3.10.0, macos) (push) Has been cancelled
Build / firmware (HACKRF_ONE, latest, macos) (push) Has been cancelled
Build / firmware (HACKRF_ONE, latest, windows) (push) Has been cancelled
Build / firmware (JAWBREAKER, 3.10.0, macos) (push) Has been cancelled
Build / firmware (JAWBREAKER, latest, macos) (push) Has been cancelled
Build / firmware (PRALINE, latest, macos) (push) Has been cancelled
Build / firmware (JAWBREAKER, latest, windows) (push) Has been cancelled
Build / firmware (PRALINE, 3.10.0, macos) (push) Has been cancelled
Build / firmware (PRALINE, latest, windows) (push) Has been cancelled
Build / firmware (RAD1O, 3.10.0, macos) (push) Has been cancelled
Build / firmware (RAD1O, latest, macos) (push) Has been cancelled
Build / firmware (RAD1O, latest, windows) (push) Has been cancelled
Build / host (3.21.0, -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --install-prefix=$env:GITHUB_WORKSPACE/install, map[os:windows shell:pwsh]) (push) Has been cancelled
Build / host (3.21.0, map[os:macos shell:bash]) (push) Has been cancelled
Build / host (3.10.0, map[os:macos shell:bash]) (push) Has been cancelled
Build / host (3.16.0, map[os:macos shell:bash]) (push) Has been cancelled
Build / host (4.0.0, -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --install-prefix=$env:GITHUB_WORKSPACE/install, map[os:windows shell:pwsh]) (push) Has been cancelled
Build / host (4.0.0, map[os:macos shell:bash]) (push) Has been cancelled
Build / host (latest, --install-prefix=/usr/local, map[os:windows shell:msys2]) (push) Has been cancelled
Build / host (latest, -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --install-prefix=$env:GITHUB_WORKSPACE/install, map[os:windows shell:pwsh]) (push) Has been cancelled
Set version to 2026.01.1
This commit is contained in:
commit
bdae250310
3 changed files with 3 additions and 3 deletions
|
|
@ -1219,7 +1219,7 @@ def get_version():
|
|||
version = subprocess.run(["git", "log", "-n" "1", "--format=%h"],
|
||||
capture_output=True, encoding="utf-8", timeout=TIMEOUT)
|
||||
if version.returncode != 0:
|
||||
return "2023.01.1+"
|
||||
return "2026.01.1"
|
||||
elif version.returncode == 0:
|
||||
dirty = subprocess.run(["git", "status", "-s", "--untracked-files=no"],
|
||||
capture_output=True, encoding="utf-8", timeout=TIMEOUT)
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ if (NOT DEFINED VERSION)
|
|||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
if (GIT_VERSION_FOUND)
|
||||
set(VERSION "2024.02.1+")
|
||||
set(VERSION "2026.01.1")
|
||||
else (GIT_VERSION_FOUND)
|
||||
set(VERSION "git-${GIT_VERSION}")
|
||||
endif (GIT_VERSION_FOUND)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ if(NOT DEFINED RELEASE)
|
|||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
if (GIT_EXIT_VALUE)
|
||||
set(RELEASE "2024.02.1+")
|
||||
set(RELEASE "2026.01.1")
|
||||
else (GIT_EXIT_VALUE)
|
||||
execute_process(
|
||||
COMMAND git status -s --untracked-files=no
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue