Skip to content

Commit bdd0d29

Browse files
build: buildConfig update
Signed-off-by: ocldev <[email protected]>
1 parent 95b3d16 commit bdd0d29

File tree

4 files changed

+15
-69
lines changed

4 files changed

+15
-69
lines changed

.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/24.52
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='7fddb3aad5abf6c441d68e0a742b8eb5166b1251-3238'
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/24.52
44
dest_dir: infra
55
fetch_tags: true
6-
revision: v6582
6+
revision: v6582.2796.0
77
type: git
88
converter: M-3107
99
version: '1'

version.cmake

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

7-
if(UNIX)
8-
find_program(GIT NAMES git)
9-
find_program(PYTHON_EXECUTABLE NAMES "python3")
10-
if((NOT "${GIT}" STREQUAL "GIT-NOTFOUND") AND (NOT "${PYTHON_EXECUTABLE}" STREQUAL "PYTHON_EXECUTABLE-NOTFOUND"))
11-
if(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-
set(PYTHON_arg ${CMAKE_CURRENT_SOURCE_DIR}/scripts/neo_ww_calculator.py ${GIT_output})
19-
execute_process(
20-
COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_arg}
21-
OUTPUT_VARIABLE VERSION_output
22-
OUTPUT_STRIP_TRAILING_WHITESPACE
23-
)
24-
string(REPLACE "." ";" VERSION_list ${VERSION_output})
25-
endif()
26-
else()
27-
message(WARNING "Unable to determine OpenCL major.minor version. Defaulting to 1.0")
28-
endif()
29-
30-
if(NOT DEFINED NEO_OCL_VERSION_MAJOR)
31-
if(NOT DEFINED VERSION_list)
32-
set(NEO_OCL_VERSION_MAJOR 1)
33-
else()
34-
list(GET VERSION_list 0 NEO_OCL_VERSION_MAJOR)
35-
message(STATUS "Computed OpenCL version major is: ${NEO_OCL_VERSION_MAJOR}")
36-
endif()
37-
endif()
38-
39-
if(NOT DEFINED NEO_OCL_VERSION_MINOR)
40-
if(NOT DEFINED VERSION_list)
41-
set(NEO_OCL_VERSION_MINOR 0)
42-
else()
43-
list(GET VERSION_list 1 NEO_OCL_VERSION_MINOR)
44-
message(STATUS "Computed OpenCL version minor is: ${NEO_OCL_VERSION_MINOR}")
45-
endif()
46-
endif()
47-
else()
48-
if(NOT DEFINED NEO_OCL_VERSION_MAJOR)
49-
set(NEO_OCL_VERSION_MAJOR 1)
50-
endif()
51-
52-
if(NOT DEFINED NEO_OCL_VERSION_MINOR)
53-
set(NEO_OCL_VERSION_MINOR 0)
54-
endif()
55-
endif()
56-
57-
find_program(GIT NAMES git)
58-
if(NOT "${GIT}" STREQUAL "GIT-NOTFOUND")
59-
if(IS_DIRECTORY ${NEO_SOURCE_DIR}/.git)
60-
set(GIT_arg --git-dir=${NEO_SOURCE_DIR}/.git rev-parse HEAD)
61-
execute_process(
62-
COMMAND ${GIT} ${GIT_arg}
63-
OUTPUT_VARIABLE NEO_REVISION
64-
OUTPUT_STRIP_TRAILING_WHITESPACE
65-
)
66-
endif()
67-
endif()
68-
69-
if(NOT DEFINED NEO_REVISION)
70-
set(NEO_REVISION "No git SHA found, compiled outside git folder")
71-
endif()
7+
set(NEO_OCL_VERSION_MAJOR 24)
8+
set(NEO_OCL_VERSION_MINOR 52)
729

7310
if(NOT DEFINED NEO_VERSION_BUILD)
74-
set(NEO_VERSION_BUILD 0)
11+
set(NEO_VERSION_BUILD 032224)
12+
set(NEO_REVISION 032224)
13+
else()
14+
set(NEO_REVISION ${NEO_VERSION_BUILD})
7515
endif()
7616

7717
if(NOT DEFINED NEO_VERSION_HOTFIX)

0 commit comments

Comments
 (0)