-
Notifications
You must be signed in to change notification settings - Fork 242
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
Merge ktxtools into main #714
Conversation
86eec2c
to
577f26e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Two very minor change requests. One unrelated to your work but in a place you are already changing.
I'm mystified by the macOS build failures when
|
There are no CMake commands either in the root |
I didn't disable anything. What are you talking about? Note that BASISU_SUPPORT_SSE will be overridden and turned off if the build detects the CPU is not x86_64 but otherwise it will use whatever value is passed to CMake. |
I have rebased the PR to the main again. |
d4365a9
to
7dac750
Compare
I successfully whacked every compiler warnings. 2 job has a single failing test with (what looks like some stdin issue on Windows with ktx2check):
The ARM tests most likely have to be disabled until there is a way to make the checks happen. |
This is very strange as all tests pass in
"make the checks happen"?
You can disable the CTS checks on the arm64 job but not on the entire Linux build. |
We did not change ktx2check. I checked it locally and it also fails in the current main on Windows with both MSVC and MinGW.
By either making the output deterministic or having checks with tolerance (like ktx diff).
I will only disable the CTS tests for that specific build, so even the unittests will keep running. |
Something happened yesterday. The GitHub action logs show successful PR builds with the now failing test passing until sometime yesterday. Later yesterday, at build 113, they started failing. Unfortunately I can't find either the time or commit being built in the logs. Most irritating.
Thanks.
Sounds good. As the CI services use "build" to refer to the all the configurations that are run and "job" to refer to a single configuration. I make my comment to make sure you would only disable the tests in the single configuration. |
I've started seeing the same issue in my Windows builds. So far I've been unable to reproduce it locally. However when I inadvertently ran the command used by the test in PowerShell instead of Bash
I got a very similar error
I wonder if the tests are somehow being run in PowerShell. The configuration output shows it finding the Git 4 Windows bash so |
The pipe read test failure is happening in all builds now. Git for Windows in both the vs2022 and vs2019 runner images was updated from 2.40.1 to 2.41.0 on June 6th. I suspect something in this update is the cause of the failure. |
Yup. I updated Git on my Windows 11 to 2.41.0 and now I see the failure locally. I'll look into it more later today. |
I suspected something similar. Thank you. |
I have disabled the CTS testing on the single ARM job. Yes, We were talking about the same thing but I was not aware the terminology difference. Thank you for being explicit and letting me know. |
Please fix the merge conflicts. I'm not sure where they've come from. The changes I just checked in to main are small. Sorry for the trouble. Also if you rebase, you'll get the fix to not run the failing pipe test on Windows. The 4.2.0 release is done. It is building now. Once the rebase is complete I can merge this. |
It's RELEASE_NOTES.md. Just accept the file in main. The bit you changed (master->main) no longer exists in the new release notes. |
I have rebased the PR to the main. |
PR to merge the contents of the ktxtools branch into main. This PR should be functionally identical to the ktxtools branch. Briefs: Rebase ktxtools onto main Update the CTS golden files to pickup the changes in ASTC and ZSTD versions Add CTS testing to MinGW and Windows CI builds Pickup changes in image.hpp from main to ktxtools's image.hpp Fix any remaining warnings
PR to merge the contents of the ktxtools branch into main. This PR should be functionally identical to the ktxtools branch. Briefs: Rebase ktxtools onto main Update the CTS golden files to pickup the changes in ASTC and ZSTD versions Add CTS testing to MinGW and Windows CI builds Pickup changes in image.hpp from main to ktxtools's image.hpp Fix any remaining warnings
PR to merge the contents of the ktxtools branch into main. This PR should be functionally identical to the ktxtools branch. Briefs: Rebase ktxtools onto main Update the CTS golden files to pickup the changes in ASTC and ZSTD versions Add CTS testing to MinGW and Windows CI builds Pickup changes in image.hpp from main to ktxtools's image.hpp Fix any remaining warnings
PR to merge the contents of the ktxtools branch into main. This PR should be functionally identical to the ktxtools branch. Briefs: Rebase ktxtools onto main Update the CTS golden files to pickup the changes in ASTC and ZSTD versions Add CTS testing to MinGW and Windows CI builds Pickup changes in image.hpp from main to ktxtools's image.hpp Fix any remaining warnings
PR to merge the contents of the ktxtools branch into main. This PR should be functionally identical to the ktxtools branch. Briefs: Rebase ktxtools onto main Update the CTS golden files to pickup the changes in ASTC and ZSTD versions Add CTS testing to MinGW and Windows CI builds Pickup changes in image.hpp from main to ktxtools's image.hpp Fix any remaining warnings
PR to merge the contents of the ktxtools branch into main.
This PR should be functionally identical to the ktxtools branch. Changes other than the rebase itself are in the separate second commit.
Briefs:
image.hpp
from main to ktxtools'simage.hpp
Please complete the final review of this scope including the CTS.