Skip to content

build: point the submodule at the encoder's main - #2000

Merged
johan-bell merged 1 commit into
1878-api-cms-hls-media-data-modelfrom
1878-submodule-to-main
Sep 3, 2026
Merged

build: point the submodule at the encoder's main#2000
johan-bell merged 1 commit into
1878-api-cms-hls-media-data-modelfrom
1878-submodule-to-main

Conversation

@johan-bell

Copy link
Copy Markdown
Collaborator

#200 is merged (33e0ecf on bccsa/luminary-media-convert main), so the player packages the app builds against now live on the encoder's main.

Two things needed changing, and both were urgent rather than tidy-up:

  • The pinned commit was ff0f6c9, which existed only on luminary-1897-encrypted-hls. That branch was auto-deleted when APP: Add query caching for heavy database queries #200 merged, so the pin was left pointing at an unreachable commit — a fresh git clone --recurse-submodules would keep working only until GitHub garbage-collects it, then fail outright.
  • .gitmodules still named the integration branch, so git submodule update --remote had nothing to track.

Both now point at main / 33e0ecf.

Nothing else changes: 33e0ecf is the squash of exactly the commits ff0f6c9 was an ancestor of, plus #226, #227 and #229, so the app builds against the same player sources it did before — with the window/server crash fix and the work-directory reclamation included.

#200 is merged, so the player packages the app builds against live on the
encoder's main branch. The pin was ff0f6c9 and `branch` still named the
integration branch — which the merge deleted, leaving the pinned commit
unreachable and every fresh checkout one GitHub garbage collection away
from failing to clone it.

Both now point at main: 33e0ecf, the squash of #200.
@johan-bell
johan-bell merged commit ff98ab9 into 1878-api-cms-hls-media-data-model Sep 3, 2026
@johan-bell
johan-bell deleted the 1878-submodule-to-main branch September 3, 2026 20:18
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.

1 participant