Skip to content

Commit 4aa8b8e

Browse files
build: buildConfig update
Signed-off-by: ocldev <ocldev@intel.com>
1 parent 8753f87 commit 4aa8b8e

4 files changed

Lines changed: 15 additions & 63 deletions

File tree

.github/pull-request.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
defaultbranch: master
1+
defaultbranch: releases/26.05
22
draft: true
3+
branchtype: master

Jenkinsfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@
88
*/
99

1010
dependenciesRevision='630ce07c1ad4b7a4ccb1e6ce21cc05e2f81ee320-3961'
11+
buildConfig = [
12+
'master-build': ['gcc11', 'gcc12', 'gcc13', 'gcc14'],
13+
'master-gate': ['gcc11', 'gcc12', 'gcc13', 'gcc14'],
14+
'branch': 'master',
15+
]

manifests/infra.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
components:
22
infra:
3-
branch: master
3+
branch: neo/releases/26.05
44
dest_dir: infra
55
fetch_tags: true
6-
revision: v7692
6+
revision: v7692.3714.0
77
type: git
88
converter: M-3107
99
version: '1'

version.cmake

Lines changed: 6 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,68 +4,14 @@
44
# SPDX-License-Identifier: MIT
55
#
66

7-
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/neo_ww_calculator.cmake)
8-
9-
if(UNIX)
10-
find_program(GIT NAMES git)
11-
if(NOT "${GIT}" STREQUAL "GIT-NOTFOUND" AND IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
12-
set(GIT_arg --git-dir=${NEO_SOURCE_DIR}/.git show -s --format=%ct)
13-
execute_process(
14-
COMMAND ${GIT} ${GIT_arg}
15-
OUTPUT_VARIABLE GIT_output
16-
OUTPUT_STRIP_TRAILING_WHITESPACE
17-
)
18-
neo_ww_calculator(${GIT_output} VERSION_output)
19-
string(REPLACE "." ";" VERSION_list ${VERSION_output})
20-
else()
21-
message(WARNING "Unable to determine OpenCL major.minor version. Defaulting to 1.0")
22-
endif()
23-
24-
if(NOT DEFINED NEO_OCL_VERSION_MAJOR)
25-
if(NOT DEFINED VERSION_list)
26-
set(NEO_OCL_VERSION_MAJOR 1)
27-
else()
28-
list(GET VERSION_list 0 NEO_OCL_VERSION_MAJOR)
29-
message(STATUS "Computed OpenCL version major is: ${NEO_OCL_VERSION_MAJOR}")
30-
endif()
31-
endif()
32-
33-
if(NOT DEFINED NEO_OCL_VERSION_MINOR)
34-
if(NOT DEFINED VERSION_list)
35-
set(NEO_OCL_VERSION_MINOR 0)
36-
else()
37-
list(GET VERSION_list 1 NEO_OCL_VERSION_MINOR)
38-
message(STATUS "Computed OpenCL version minor is: ${NEO_OCL_VERSION_MINOR}")
39-
endif()
40-
endif()
41-
else()
42-
if(NOT DEFINED NEO_OCL_VERSION_MAJOR)
43-
set(NEO_OCL_VERSION_MAJOR 1)
44-
endif()
45-
46-
if(NOT DEFINED NEO_OCL_VERSION_MINOR)
47-
set(NEO_OCL_VERSION_MINOR 0)
48-
endif()
49-
endif()
50-
51-
find_program(GIT NAMES git)
52-
if(NOT "${GIT}" STREQUAL "GIT-NOTFOUND")
53-
if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
54-
set(GIT_arg --git-dir=${NEO_SOURCE_DIR}/.git rev-parse HEAD)
55-
execute_process(
56-
COMMAND ${GIT} ${GIT_arg}
57-
OUTPUT_VARIABLE NEO_REVISION
58-
OUTPUT_STRIP_TRAILING_WHITESPACE
59-
)
60-
endif()
61-
endif()
62-
63-
if(NOT DEFINED NEO_REVISION)
64-
set(NEO_REVISION "No git SHA found, compiled outside git folder")
65-
endif()
7+
set(NEO_OCL_VERSION_MAJOR 26)
8+
set(NEO_OCL_VERSION_MINOR 05)
669

6710
if(NOT DEFINED NEO_VERSION_BUILD)
68-
set(NEO_VERSION_BUILD 0)
11+
set(NEO_VERSION_BUILD 037020)
12+
set(NEO_REVISION 037020)
13+
else()
14+
set(NEO_REVISION ${NEO_VERSION_BUILD})
6915
endif()
7016

7117
if(NOT DEFINED NEO_VERSION_HOTFIX)

0 commit comments

Comments
 (0)