Skip to content

Commit 4539ae0

Browse files
[CI] Fix Update GPU Driver GitHub Action (#6234)
We seem to be tripping over cli/cli#2979 in the sycl_update_gpu_driver.yml action. Fortunately, adding the `--head` flag to the PR creation command is trivial and _should_ work around it. Also, the `sycl` branch is protected on intel/llvm, so am switching from a direct push to a PR for the nightly. Note that this has been tested on my fork and works, but that was true for its previous incarnation. It is possible that this fix may yet be incomplete. Won't know until we exercise it.
1 parent 6a32706 commit 4539ae0

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

.github/workflows/sycl_update_gpu_driver.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
git add -u
3030
git commit -m "[GHA] Uplift GPU RT version for Linux CI" || exit 0 # exit if commit is empty
3131
git push https://[email protected]/${{ github.repository }} ${BRANCH}
32-
gh pr create --title "[GHA] Uplift GPU RT version for Linux CI" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" --assignee @intel/dpcpp-devops-reviewers
32+
gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Linux CI" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" --assignee @intel/dpcpp-devops-reviewers
3333
3434
update_driver_linux_staging:
3535
runs-on: ubuntu-latest
@@ -42,14 +42,17 @@ jobs:
4242
echo 'NEW_DRIVER_VERSION='$version >> $GITHUB_ENV
4343
- name: Update sycl Branch
4444
env:
45+
BRANCH: ci/update_gpu_driver-linux_staging-${{ env.NEW_DRIVER_VERSION }}
4546
LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }}
4647
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4748
run: |
4849
cd $GITHUB_WORKSPACE
4950
# Set fake identity to fulfil git requirements
5051
git config --global user.name "GitHub Actions"
5152
git config --global user.email "[email protected]"
52-
git checkout sycl
53+
git checkout -B $BRANCH
5354
git add -u
54-
git commit -m "[GHA] Uplift GPU RT version for Nightly runs" || exit 0
55-
git push origin sycl
55+
git commit -m "[GHA] Uplift GPU RT version for Nightly Builds" || exit 0 # exit if commit is empty
56+
git push https://[email protected]/${{ github.repository }} ${BRANCH}
57+
gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Nightly Builds" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION" --assignee @intel/dpcpp-devops-reviewers
58+

0 commit comments

Comments
 (0)