Skip to content

Fix CI for release0.6 #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ name: black
# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: [master]
pull_request:
push:
branches: [master]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ name: clang-format Check
# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: [master]
pull_request:
push:
branches: [master]

jobs:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.6.1] - 2021-03-01
### Fixed
- Do not use POP_FRONT in FindDPCPP.cmake so that we can use a cmake version older that 3.15.

## [0.6.0] - 2021-03-01
### Added
- Documentation improvements.
Expand Down
4 changes: 2 additions & 2 deletions dpctl-capi/cmake/modules/FindDPCPP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ execute_process(
OUTPUT_VARIABLE dpcpp_ver
)

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

# set package-level variables
set(DPCPP_ROOT ${DPCPP_INSTALL_DIR})
list(POP_FRONT DPCPP_VERSION_LIST DPCPP_VERSION)
list(GET DPCPP_VERSION_LIST 0 DPCPP_VERSION)
set(DPCPP_INCLUDE_DIR ${DPCPP_INSTALL_DIR}/include)
set(DPCPP_SYCL_INCLUDE_DIR ${DPCPP_INSTALL_DIR}/include/sycl)
set(DPCPP_LIBRARY_DIR ${DPCPP_INSTALL_DIR}/lib)
Expand Down