fix: shim uniform redefinitions and release ZIP not attaching#6
Merged
Merged
Conversation
Tier-2 shim: - Preprocessor now filters shim uniforms that the shader already declares itself (colortex0, gtexture, lightmap, etc.) — prevents redefinition errors without hardcoding an exclusion list Release ZIP: - release.yml trigger (release: published) does not fire for releases created by GITHUB_TOKEN — this is a GitHub limitation - Moved ZIP packaging into release-please.yml as a dependent job that runs when release_created == true, using the tag_name output directly - Removed the now-redundant release.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Tier-2 GLSL shim — uniform redefinition errors
Some shader files declare their own uniforms (
colortex0,gtexture,lightmap,frameTimeCounter, …). The shim was declaring the same ones, causing redefinition errors on every validation run.Fix: the Python preprocessor now scans the inlined shader source for already-declared uniform names and drops those lines from the shim before concatenating. No hardcoded exclusion list needed — works automatically for any future shader additions.
Release ZIP not attaching
release.ymlwas triggered byon: release: types: [published], but GitHub does not fire workflow events for releases created byGITHUB_TOKEN(the token release-please uses). The ZIP job never ran.Fix: moved the packaging step directly into
release-please.ymlas a dependent job — it runs in the same workflow immediately afterrelease_created == true, using thetag_nameoutput. The now-redundantrelease.ymlis removed.