Skip to content

[CI] Fix post-commit Windows job #18322

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 6 commits into from
May 6, 2025
Merged

[CI] Fix post-commit Windows job #18322

merged 6 commits into from
May 6, 2025

Conversation

ayylol
Copy link
Contributor

@ayylol ayylol commented May 5, 2025

#18124 broke the windows post-commit, this should fix that due to removing the compiler variable from the E2E composite action, as well as not having listed a target device. This should fix that.

@ayylol ayylol temporarily deployed to WindowsCILock May 5, 2025 20:11 — with GitHub Actions Inactive
@ayylol ayylol temporarily deployed to WindowsCILock May 5, 2025 20:11 — with GitHub Actions Inactive
@ayylol ayylol temporarily deployed to WindowsCILock May 5, 2025 20:33 — with GitHub Actions Inactive
@ayylol ayylol temporarily deployed to WindowsCILock May 5, 2025 20:33 — with GitHub Actions Inactive
@ayylol ayylol temporarily deployed to WindowsCILock May 5, 2025 20:36 — with GitHub Actions Inactive
@ayylol ayylol changed the title [CI] Try fixing post-commit [CI] Fix post-commit Windows job May 5, 2025
@ayylol ayylol marked this pull request as ready for review May 5, 2025 20:47
@ayylol ayylol requested a review from a team as a code owner May 5, 2025 20:47
@@ -244,6 +244,7 @@ jobs:
target_devices: all
binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
extra_lit_opts: --param sycl_build_targets="spir"
compiler: cl
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we make this the default value so we dont have to pass it?

Comment on lines 18 to +21
cxx_compiler:
required: false

compiler:
required: false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need cxx_compiler and compiler? Can't we just use cxx_compiler?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From what I understand the difference is that compiler is what we use to build the project, while cxx_compiler is the path to the compiler we build.

Copy link
Contributor

@sarnex sarnex May 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah ok, can you rename the vars to be clear?

@ayylol ayylol temporarily deployed to WindowsCILock May 6, 2025 13:49 — with GitHub Actions Inactive
@ayylol ayylol temporarily deployed to WindowsCILock May 6, 2025 13:50 — with GitHub Actions Inactive
Copy link
Contributor

@sarnex sarnex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging now to fix ci but id appreciate it if you could address the remaining comment in a follow up

@sarnex sarnex merged commit d32060a into intel:sycl May 6, 2025
20 checks passed
@ayylol ayylol temporarily deployed to WindowsCILock May 6, 2025 14:18 — with GitHub Actions Inactive
@ayylol ayylol deleted the postcommit-fix branch May 6, 2025 14:28
@ayylol ayylol temporarily deployed to WindowsCILock May 6, 2025 14:58 — with GitHub Actions Inactive
@ayylol ayylol temporarily deployed to WindowsCILock May 6, 2025 14:58 — with GitHub Actions Inactive
sarnex pushed a commit that referenced this pull request May 6, 2025
We have `cxx` and `cxx_compiler`, very similar names so it can be
confusing. `cxx` is used to build the project, while `cxx_compiler` is
the compiler produced so renaming the latter to `sycl_compiler`.
Additionally aligning the Windows with the Linux build job by renaming
`compiler` to `cxx`.

Addresses comments from #18322
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants