Commit 755cfe9
authored
QVAC-17422: Normalize addon prebuild workflows around composite actions (#1760)
* infra: switch workflow to use composite actions for setup
* Apply normalization to other prebuilds
* Standardize nmtcpp android setup
* infra: drop dead nmtcpp prebuild patching steps
These steps all patched `third-party/bergamot-translator/...` paths,
which no longer exist since bergamot-translator moved to the
qvac-registry-vcpkg registry as a prebuilt vcpkg port. Every step was
guarded by `if [ -f ... ]` and silently no-opped on every run.
Removed:
- clang-cl / C++20 / CMake-version / PCRE2 / std::result_of / -march=native
source patches against marian-dev, sentencepiece, clog, cpuinfo,
ssplit and intgemm
- `Build PCRE2 first for Windows` post-generate workaround
- `submodules: recursive` on checkout (package has no .gitmodules)
Kept `Create config.cmake for Bergamot backend` (consumed by the
addon's CMakeLists.txt) and `Replace bare-make's CMake` on
ubuntu-22.04. Workflow: 514 → 247 lines.
Any port-level patches still needed for marian-dev & friends should
live in the bergamot-translator vcpkg portfile in qvac-registry-vcpkg,
not in CI.
* infra: drop dead nmtcpp CI scripts and bare-make cmake workaround
- Remove packages/qvac-lib-infer-nmtcpp/ci/*. These scripts are not
referenced from any workflow, script, or doc. Running
contributor-editable shell scripts during prebuilds would be a
supply-chain risk (the workflow has PAT_TOKEN and AWS OIDC role
access). Two of them also patched an MLC/TVM vendor path that no
longer exists; the third was a standalone manual integration-test
helper tied to retired `qvac-ext-lib-mlc` runs.
- Remove the `Replace bare-make's CMake with compatible version`
step (ubuntu-22.04). It existed to downgrade bare-make's bundled
CMake 4.x so that marian-dev's cmake_minimum_required(VERSION 3.1)
would still parse. Since bergamot-translator is now a prebuilt
vcpkg port from qvac-registry-vcpkg, those CMake files are never
processed by bare-make; the only CMakeLists run here is the addon's
own (requires 3.25).
Workflow: 247 → 222 lines. Other prebuild workflows were audited for
similar patches against vcpkg-managed deps and are already clean.
* infra: re-pin composite-actions SHA and finalize nmtcpp normalization
Two related changes for the prebuild workflow normalization branch.
Re-pin composite actions to the squash-merged SHA. PR #1742 landed on
main as a single squash-merge, so the pre-squash SHA the prebuilds
were pinned against (3d48906) is no longer reachable from main.
Update all 9 prebuilds-*.yml to 1d9b216
a6d8 across setup-vcpkg, setup-build-host, setup-apple-clang, and
strip-prebuilds.
Finalize nmtcpp prebuild normalization:
- Drop "Create config.cmake for Bergamot backend". All three cache
vars it set are dead post bergamot-translator-vcpkg migration:
USE_BERGAMOT is already the addon CMakeLists.txt default; nothing
in the addon adds -DUSE_INTGEMM so the bergamot.cpp #ifdefs never
compile in; BUILD_ARCH was historically marian-dev's, now baked
into the vcpkg port and unreferenced from the addon.
- Drop "Print run state" debug step (no peer has it).
- Drop "Configure git" PAT URL rewrite. The package has zero
git-protocol deps; post-OSS this is the same dead config that
#1591 stripped repo-wide.
- Add the missing strip-prebuilds composite-action call.
- Replace hardcoded `env.PKG_DIR` with a `workdir` workflow input on
both triggers, matching 6 of 9 peer prebuilds. Both nmtcpp callers
invoke without `workdir`, so the default keeps them working.
* infra: align onnx prebuilds with convention
* chore: drop unused fmt and spdlog vcpkg deps from tts
Both deps have been declared in the TTS package manifest since the
initial monorepo import (fede244), as transitive needs of the
piper-based TTS engine. When TTS migrated from piper to chatterbox /
supertonic, piper, piper-phonemize, and espeak-ng were correctly
removed but fmt and spdlog were left behind.
The current TTS source has zero consumers for either library: no
fmt:: / spdlog:: usage in any .cpp or .hpp file, no find_package(fmt)
or find_package(spdlog) in CMakeLists.txt, no fmt::fmt or
spdlog::spdlog in target_link_libraries. Drop both from vcpkg.json
and from the upstream-microsoft/vcpkg registry overlay in
vcpkg-configuration.json.
Also drop the macOS-only "Unlink Homebrew fmt" step in the TTS
prebuild workflow. Introduced in #170 to defend against Homebrew
fmt 12.x headers shadowing vcpkg fmt 11.x on Intel Macs, it has
been emitting "No such keg" annotations on every macOS job since
GitHub stopped pre-installing fmt on the macos-15 runner images.
With no fmt consumer in TTS, there is nothing to protect.
NOTICE regeneration left for a follow-up.1 parent f568d00 commit 755cfe9
14 files changed
Lines changed: 189 additions & 1525 deletions
File tree
- .github/workflows
- packages
- qvac-lib-infer-nmtcpp/ci
- qvac-lib-infer-onnx-tts
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | 83 | | |
102 | 84 | | |
103 | 85 | | |
| |||
116 | 98 | | |
117 | 99 | | |
118 | 100 | | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
132 | 106 | | |
133 | 107 | | |
134 | 108 | | |
| |||
142 | 116 | | |
143 | 117 | | |
144 | 118 | | |
145 | | - | |
146 | | - | |
| 119 | + | |
| 120 | + | |
147 | 121 | | |
148 | 122 | | |
149 | 123 | | |
| |||
153 | 127 | | |
154 | 128 | | |
155 | 129 | | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
183 | | - | |
184 | | - | |
185 | | - | |
186 | | - | |
187 | | - | |
188 | | - | |
189 | | - | |
190 | | - | |
191 | | - | |
192 | | - | |
193 | | - | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | | - | |
205 | | - | |
206 | | - | |
207 | | - | |
| 130 | + | |
| 131 | + | |
208 | 132 | | |
209 | 133 | | |
210 | 134 | | |
| |||
216 | 140 | | |
217 | 141 | | |
218 | 142 | | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | 143 | | |
226 | 144 | | |
227 | 145 | | |
228 | 146 | | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
235 | | - | |
236 | 147 | | |
237 | 148 | | |
238 | 149 | | |
| |||
275 | 186 | | |
276 | 187 | | |
277 | 188 | | |
278 | | - | |
279 | | - | |
280 | | - | |
281 | | - | |
282 | | - | |
283 | | - | |
284 | | - | |
285 | | - | |
286 | | - | |
287 | | - | |
288 | | - | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
289 | 193 | | |
290 | 194 | | |
291 | 195 | | |
| |||
309 | 213 | | |
310 | 214 | | |
311 | 215 | | |
312 | | - | |
0 commit comments