Skip to content

Commit 9961fbb

Browse files
authored
Update to 1.28.4 (#446)
* Add notes for test content * CMakefile.txt check for PRODUCT_GUID update for releases Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>
1 parent b045532 commit 9961fbb

3 files changed

Lines changed: 21 additions & 5 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# Level zero loader changelog
2+
## v1.28.4
3+
* Add README.md and CONTRIBUTING.md changes for Unit Testing
4+
* Add CMakefile.txt check for PRODUCT_GUID.txt updates before release
5+
* Update to version 1.28.4
6+
* Fix bug in 1.28.3 that didn't update the PRODUCT_GUID.txt
27
## v1.28.3
38
* Address clang build warnings for empty structures
49
* Fix successive calls to zeInitDivers when no drivers found failing

CMakeLists.txt

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(MSVC AND (MSVC_VERSION LESS 1900))
1313
endif()
1414

1515
# This project follows semantic versioning (https://semver.org/)
16-
project(level-zero VERSION 1.28.3)
16+
project(level-zero VERSION 1.28.4)
1717
include(GNUInstallDirs)
1818

1919
find_package(Git)
@@ -284,9 +284,14 @@ if(EXISTS "${PRODUCT_GUID_FILE}")
284284
)
285285
file(WRITE "${PRODUCT_GUID_FILE}" "${PROJECT_VERSION}\n${GENERATED_PRODUCT_GUID}")
286286
message(STATUS "Generated Product GUID: ${GENERATED_PRODUCT_GUID} for version ${PROJECT_VERSION}")
287+
message(FATAL_ERROR
288+
"PRODUCT_GUID.txt has been regenerated for version ${PROJECT_VERSION}.\n"
289+
"Please commit the updated PRODUCT_GUID.txt before continuing:\n"
290+
" git add ${PRODUCT_GUID_FILE}\n"
291+
" git commit -m 'Update PRODUCT_GUID.txt for version ${PROJECT_VERSION}'\n"
292+
"Then re-run cmake.")
287293
else()
288-
string(REPLACE "\n" ";" GUID_CONTENTS "${SAVED_PRODUCT_GUID}")
289-
list(GET GUID_CONTENTS 1 GENERATED_PRODUCT_GUID)
294+
list(GET SAVED_PRODUCT_GUID 1 GENERATED_PRODUCT_GUID)
290295
endif()
291296
else()
292297
execute_process(
@@ -295,6 +300,12 @@ else()
295300
OUTPUT_STRIP_TRAILING_WHITESPACE
296301
)
297302
file(WRITE "${PRODUCT_GUID_FILE}" "${PROJECT_VERSION}\n${GENERATED_PRODUCT_GUID}")
303+
message(FATAL_ERROR
304+
"PRODUCT_GUID.txt did not exist and has been created for version ${PROJECT_VERSION}.\n"
305+
"Please commit it before continuing:\n"
306+
" git add ${PRODUCT_GUID_FILE}\n"
307+
" git commit -m 'Add PRODUCT_GUID.txt for version ${PROJECT_VERSION}'\n"
308+
"Then re-run cmake.")
298309
endif()
299310
message(STATUS "Using Product GUID: ${GENERATED_PRODUCT_GUID} for version ${PROJECT_VERSION}")
300311

PRODUCT_GUID.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1.28.2
2-
115378b3-db3b-44cf-8c29-eb1184210c18
1+
1.28.4
2+
cfa0eed1-ba15-4a52-8efe-5d532373fded

0 commit comments

Comments
 (0)