diff --git a/.github/pull-request.yml b/.github/pull-request.yml index 5f5add5f25..ab1971f4a8 100644 --- a/.github/pull-request.yml +++ b/.github/pull-request.yml @@ -1,2 +1,3 @@ -defaultbranch: master +defaultbranch: releases/25.22 draft: true +branchtype: master diff --git a/Jenkinsfile b/Jenkinsfile index 297cee26fd..220783d41a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,3 +8,8 @@ */ dependenciesRevision='2d4f30c4b4f9e12d62a90c0027bc9e1223807149-3416' +buildConfig = [ + 'master-build': ['gcc11', 'gcc12', 'gcc13', 'gcc14'], + 'master-gate': ['gcc11', 'gcc12', 'gcc13', 'gcc14'], + 'branch': 'master', +] diff --git a/manifests/infra.yml b/manifests/infra.yml index 329a7d2a14..ceb1821d43 100644 --- a/manifests/infra.yml +++ b/manifests/infra.yml @@ -1,9 +1,9 @@ components: infra: - branch: master + branch: neo/releases/25.22 dest_dir: infra fetch_tags: true - revision: v6982 + revision: v6982.3130.0 type: git converter: M-3107 version: '1' diff --git a/version.cmake b/version.cmake index 1355b1226e..67e8f943db 100644 --- a/version.cmake +++ b/version.cmake @@ -1,77 +1,17 @@ # -# Copyright (C) 2018-2024 Intel Corporation +# Copyright (C) 2018-2025 Intel Corporation # # SPDX-License-Identifier: MIT # -if(UNIX) - find_program(GIT NAMES git) - find_program(PYTHON_EXECUTABLE NAMES "python3") - if((NOT "${GIT}" STREQUAL "GIT-NOTFOUND") AND (NOT "${PYTHON_EXECUTABLE}" STREQUAL "PYTHON_EXECUTABLE-NOTFOUND")) - if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git) - set(GIT_arg --git-dir=${NEO_SOURCE_DIR}/.git show -s --format=%ct) - execute_process( - COMMAND ${GIT} ${GIT_arg} - OUTPUT_VARIABLE GIT_output - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - set(PYTHON_arg ${CMAKE_CURRENT_SOURCE_DIR}/scripts/neo_ww_calculator.py ${GIT_output}) - execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_arg} - OUTPUT_VARIABLE VERSION_output - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - string(REPLACE "." ";" VERSION_list ${VERSION_output}) - endif() - else() - message(WARNING "Unable to determine OpenCL major.minor version. Defaulting to 1.0") - endif() - - if(NOT DEFINED NEO_OCL_VERSION_MAJOR) - if(NOT DEFINED VERSION_list) - set(NEO_OCL_VERSION_MAJOR 1) - else() - list(GET VERSION_list 0 NEO_OCL_VERSION_MAJOR) - message(STATUS "Computed OpenCL version major is: ${NEO_OCL_VERSION_MAJOR}") - endif() - endif() - - if(NOT DEFINED NEO_OCL_VERSION_MINOR) - if(NOT DEFINED VERSION_list) - set(NEO_OCL_VERSION_MINOR 0) - else() - list(GET VERSION_list 1 NEO_OCL_VERSION_MINOR) - message(STATUS "Computed OpenCL version minor is: ${NEO_OCL_VERSION_MINOR}") - endif() - endif() -else() - if(NOT DEFINED NEO_OCL_VERSION_MAJOR) - set(NEO_OCL_VERSION_MAJOR 1) - endif() - - if(NOT DEFINED NEO_OCL_VERSION_MINOR) - set(NEO_OCL_VERSION_MINOR 0) - endif() -endif() - -find_program(GIT NAMES git) -if(NOT "${GIT}" STREQUAL "GIT-NOTFOUND") - if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git) - set(GIT_arg --git-dir=${NEO_SOURCE_DIR}/.git rev-parse HEAD) - execute_process( - COMMAND ${GIT} ${GIT_arg} - OUTPUT_VARIABLE NEO_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - endif() -endif() - -if(NOT DEFINED NEO_REVISION) - set(NEO_REVISION "No git SHA found, compiled outside git folder") -endif() +set(NEO_OCL_VERSION_MAJOR 25) +set(NEO_OCL_VERSION_MINOR 22) if(NOT DEFINED NEO_VERSION_BUILD) - set(NEO_VERSION_BUILD 0) + set(NEO_VERSION_BUILD 033944) + set(NEO_REVISION 033944) +else() + set(NEO_REVISION ${NEO_VERSION_BUILD}) endif() if(NOT DEFINED NEO_VERSION_HOTFIX)