Skip to content
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

Fix #2658: Properly include all headers in deployments #2979

Merged
merged 1 commit into from
Jul 25, 2022

Conversation

spnda
Copy link
Contributor

@spnda spnda commented Jul 25, 2022

The workflow used to only zip files in include/glslang/*, which does not respect subdirectories. Also including include/glslang/**/* fixes this issue. If you look at the current builds, you can precisely observe this behaviour as build_info.h in the root directory is actually zipped. The ${SUFFIX} seems to also have been blindly copied from the old CI which has no usage anymore. This workflow never worked. I fully tested this on Ubuntu 20.04 in WSL and on my macOS 13 Mac.

Also, I've rewritten the GitHub workflow to also build for Windows, but is there any reason why VS 2015 is strictly required? GitHub workflow only offers VS Enterprise 2017, VS Enterprise 2019, or VS Enterprise 2022.

Fixes #2658.

@CLAassistant
Copy link

CLAassistant commented Jul 25, 2022

CLA assistant check
All committers have signed the CLA.

@greg-lunarg greg-lunarg added the kokoro:run Trigger Google bot runs label Jul 25, 2022
@kokoro-team kokoro-team removed the kokoro:run Trigger Google bot runs label Jul 25, 2022
Copy link
Contributor

@jeremy-lunarg jeremy-lunarg left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the fix!

@jeremy-lunarg jeremy-lunarg merged commit 607771c into KhronosGroup:master Jul 25, 2022
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.

The builds are broken
5 participants