Skip to content

Commit 58cb0a3

Browse files
authored
Fix CI for release0.6 (#304)
* We need at least CMake 3.15 for dpctl-capi. (#299) * Do not use POP_FRONT in FindDPCPP.cmake so that we can use a cmake version older that 3.15. * Run GitHub Actions for all PRs * Update CHANGELOG
1 parent 25f66ce commit 58cb0a3

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.github/workflows/black.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: black
55
# Controls when the action will run. Triggers the workflow on push or pull request
66
# events but only for the master branch
77
on:
8-
push:
9-
branches: [master]
108
pull_request:
9+
push:
1110
branches: [master]
1211

1312
# A workflow run is made up of one or more jobs that can run sequentially or in parallel

.github/workflows/clang-format.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: clang-format Check
55
# Controls when the action will run. Triggers the workflow on push or pull request
66
# events but only for the master branch
77
on:
8-
push:
9-
branches: [master]
108
pull_request:
9+
push:
1110
branches: [master]
1211

1312
jobs:

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [0.6.1] - 2021-03-01
10+
### Fixed
11+
- Do not use POP_FRONT in FindDPCPP.cmake so that we can use a cmake version older that 3.15.
12+
913
## [0.6.0] - 2021-03-01
1014
### Added
1115
- Documentation improvements.

dpctl-capi/cmake/modules/FindDPCPP.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ execute_process(
5454
OUTPUT_VARIABLE dpcpp_ver
5555
)
5656

57-
# If dpcpp is found then set then set the package variables
57+
# If dpcpp is found then set the package variables
5858
if(${dpcpp_result} MATCHES "0")
5959
string(REPLACE "\n" ";" DPCPP_VERSION_LIST "${dpcpp_ver}")
6060
list(GET DPCPP_VERSION_LIST 0 dpcpp_ver_line)
@@ -89,7 +89,7 @@ if(${dpcpp_result} MATCHES "0")
8989

9090
# set package-level variables
9191
set(DPCPP_ROOT ${DPCPP_INSTALL_DIR})
92-
list(POP_FRONT DPCPP_VERSION_LIST DPCPP_VERSION)
92+
list(GET DPCPP_VERSION_LIST 0 DPCPP_VERSION)
9393
set(DPCPP_INCLUDE_DIR ${DPCPP_INSTALL_DIR}/include)
9494
set(DPCPP_SYCL_INCLUDE_DIR ${DPCPP_INSTALL_DIR}/include/sycl)
9595
set(DPCPP_LIBRARY_DIR ${DPCPP_INSTALL_DIR}/lib)

0 commit comments

Comments
 (0)