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

Update KTX-Software-CTS reference to specific commit #731

Closed
wants to merge 1 commit into from

Conversation

aqnuep
Copy link
Collaborator

@aqnuep aqnuep commented Jul 6, 2023

This PR only updates the submodule reference for the KTX-Software-CTS repository, as it should always refer to a specific commit to avoid new tests causing failures on old code.

@MarkCallow, could you please merge this in? Apparently this was overlooked when merging the KTX-Tools branch into main.

@VaderDev VaderDev marked this pull request as draft July 7, 2023 00:33
@VaderDev VaderDev self-requested a review July 7, 2023 00:37
Copy link
Contributor

@VaderDev VaderDev left a comment

Choose a reason for hiding this comment

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

I think this is fine as is because this is not the submodule ref and it refers to a different "branch" (the default remote branch, rarely used).

@MarkCallow
Copy link
Collaborator

I think this is fine as is because this is not the submodule ref and it refers to a different "branch" (the default remote branch, rarely used).

What is fine as is, this PR? What refers to the default remote branch, the commit hash in this update?

In general should KTX-Software's main point to the submodule's main? Then when a tag is added we need to ensure the submodule reference at that tag points at a specific commit?

How should we manage this from now on?

Copy link
Collaborator

@MarkCallow MarkCallow left a comment

Choose a reason for hiding this comment

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

Please see my comment in the main conversation (i.e. the one right before this).

@VaderDev
Copy link
Contributor

VaderDev commented Jul 7, 2023

@MarkCallow By fine I mean I dont think there is an error in how we managed submodules so far, so this PR is not needed.

In general should KTX-Software's main point to the submodule's main? Then when a tag is added we need to ensure the submodule reference at that tag points at a specific commit?

git submodule is managed on a per commit basis with SHA. Each KTX commit references a CTS commit for it. So no need to do any extra work or synchronization beyond the normal development workflow

@aqnuep
Copy link
Collaborator Author

aqnuep commented Jul 7, 2023

Sorry, my bad. Indeed, @VaderY is right, that the branch specified in .gitsubmodule won't matter, as it is only used when you explicitly request the latest changes from the tracked branch to be pulled manually, hence this PR can be dropped.

@aqnuep aqnuep closed this Jul 7, 2023
@VaderDev VaderDev deleted the ktx-cts-submodule-ref branch July 10, 2023 19:07
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.

3 participants