Skip to content

fix: git submodules for libjpeg-turbo was not included - #6

Merged
swederik merged 1 commit into
mainfrom
fix/submodules
Aug 5, 2021
Merged

fix: git submodules for libjpeg-turbo was not included#6
swederik merged 1 commit into
mainfrom
fix/submodules

Conversation

@swederik

@swederik swederik commented Aug 5, 2021

Copy link
Copy Markdown
Member

No description provided.

@swederik
swederik merged commit 5b21336 into main Aug 5, 2021
wayfarer3130 added a commit that referenced this pull request Aug 19, 2026
This branch was cut from a July main and had not seen main's later commits, so
squashing #87 in (2a9e8b7) brought content for five files that main gained in
the meantime, and GitHub reported the PR as CONFLICTING. That blocked CI
entirely -- pull_request workflows do not run when the merge commit cannot be
created -- so no checks had run on the integration.

Resolved all five in favour of this branch, verified rather than assumed: each
was already byte-identical to ci/pnpm-trusted-publishing's version, which is
main's content plus #87's edits, so taking ours preserves both sides.

  .github/CODEOWNERS
  .github/workflows/bench.yml
  .github/workflows/pr-checks.yml
  docs/ci/self-hosted-runner.md
  tools/ci/with-nashua-lock.sh

Confirmed intact afterwards: the submodule still points at 4a68609 (fork PR #6),
set_message_level in jslib.cpp, the OJPH_WARN diagnostics, reuseDecoder in
codecFactory, truncated.test.js, DISABLE_EXCEPTION_CATCHING=0, and yarn.lock /
lerna.json still deleted with the pnpm files in place.
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