Skip to content

Commit

Permalink
Minor CI and CMake maintenance
Browse files Browse the repository at this point in the history
Bump actions versions
Friendly CMake error message as it happens on Summit with nvhpc
  • Loading branch information
williamfgc committed Apr 28, 2022
1 parent 6f03d10 commit 47ecb70
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
19 changes: 9 additions & 10 deletions .github/workflows/ci-github-actions-self-hosted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ jobs:
if: |
github.repository_owner == 'QMCPACK' &&
github.event.issue.pull_request &&
( startsWith(github.event.comment.body, 'Test this please') ||
startsWith(github.event.comment.body, 'Start testing in-house') )
startsWith(github.event.comment.body, 'Test this please')
runs-on: [self-hosted, Linux, X64, ornl-sulfur-1]

Expand Down Expand Up @@ -43,7 +42,7 @@ jobs:
- name: GitHub API Request
if: steps.check.outputs.triggered == 'true'
id: request
uses: octokit/request-action@v2.0.0
uses: octokit/request-action@v2.1.0
with:
route: ${{github.event.issue.pull_request.url}}
env:
Expand Down Expand Up @@ -72,7 +71,7 @@ jobs:
- name: Checkout PR branch
if: steps.check.outputs.triggered == 'true'
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
token: ${{secrets.GITHUB_TOKEN}}
repository: ${{fromJson(steps.request.outputs.data).head.repo.full_name}}
Expand Down Expand Up @@ -145,7 +144,7 @@ jobs:
- name: GitHub API Request
if: steps.check.outputs.triggered == 'true'
id: request
uses: octokit/request-action@v2.0.0
uses: octokit/request-action@v2.1.0
with:
route: ${{github.event.issue.pull_request.url}}
env:
Expand Down Expand Up @@ -174,7 +173,7 @@ jobs:
- name: Checkout PR branch
if: steps.check.outputs.triggered == 'true'
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
token: ${{secrets.GITHUB_TOKEN}}
repository: ${{fromJson(steps.request.outputs.data).head.repo.full_name}}
Expand Down Expand Up @@ -241,7 +240,7 @@ jobs:
- name: GitHub API Request
if: steps.check.outputs.triggered == 'true'
id: request
uses: octokit/request-action@v2.0.0
uses: octokit/request-action@v2.1.0
with:
route: ${{github.event.issue.pull_request.url}}
env:
Expand Down Expand Up @@ -270,7 +269,7 @@ jobs:
- name: Checkout PR branch
if: steps.check.outputs.triggered == 'true'
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
token: ${{secrets.GITHUB_TOKEN}}
repository: ${{fromJson(steps.request.outputs.data).head.repo.full_name}}
Expand Down Expand Up @@ -336,7 +335,7 @@ jobs:
- name: GitHub API Request
if: steps.check.outputs.triggered == 'true'
id: request
uses: octokit/request-action@v2.0.0
uses: octokit/request-action@v2.1.0
with:
route: ${{github.event.issue.pull_request.url}}
env:
Expand Down Expand Up @@ -365,7 +364,7 @@ jobs:
- name: Checkout PR branch
if: steps.check.outputs.triggered == 'true'
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
token: ${{secrets.GITHUB_TOKEN}}
repository: ${{fromJson(steps.request.outputs.data).head.repo.full_name}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-github-actions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:

steps:
- name: Checkout Action
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Configure
run: tests/test_automation/github-actions/ci/run_step.sh configure
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:

steps:
- name: Checkout Action
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -724,8 +724,8 @@ if(QMC_CUDA OR ENABLE_CUDA)
if(NOT TARGET CUDA::cublas)
message(
FATAL_ERROR
"Found an incomplete CUDA toolkit installation. "
"This often happens when CMake failed in recognizing the NVHPC internal CUDA toolkit. "
"Found an incomplete CUDA toolkit installation, target CUDA::cublas not found. "
"This often happens when CMake failed in recognizing the NVHPC internal CUDA toolkit with libcublas. "
"Set CMAKE_CUDA_COMPILER to the full path of nvcc from a complete CUDA toolkit installation.")
endif()
# Automatically set the default NVCC flags
Expand Down

0 comments on commit 47ecb70

Please sign in to comment.