mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-08-09 08:04:45 +00:00
chore(desktop): drop skipVlcSetup escape hatch
The -PskipVlcSetup / AMETHYST_SKIP_VLC opt-out is no longer used: CI relies on the actions/cache step in build.yml to avoid hitting get.videolan.org, and the in-build retry budget covers cache misses. Remove the dead opt-out from desktopApp/build.gradle.kts and the env export from the session-start hook.
This commit is contained in:
@@ -172,10 +172,6 @@ if [ -n "${CLAUDE_ENV_FILE:-}" ]; then
|
||||
echo "export ANDROID_HOME=$ANDROID_SDK_DIR" >> "$CLAUDE_ENV_FILE"
|
||||
echo "export ANDROID_SDK_ROOT=$ANDROID_SDK_DIR" >> "$CLAUDE_ENV_FILE"
|
||||
echo "export PATH=\$PATH:$ANDROID_SDK_DIR/platform-tools" >> "$CLAUDE_ENV_FILE"
|
||||
# get.videolan.org is unreachable / heavily rate-limited from CCW egress,
|
||||
# so disable the desktopApp vlcDownload / upxDownload / vlcSetup tasks by
|
||||
# default. See desktopApp/build.gradle.kts for the opt-out wiring.
|
||||
echo "export AMETHYST_SKIP_VLC=true" >> "$CLAUDE_ENV_FILE"
|
||||
fi
|
||||
|
||||
# --- Kotlin/Native: pre-install native dependencies (GCC sysroot, LLDB) ---
|
||||
|
||||
@@ -164,33 +164,6 @@ tasks.withType<Download>().configureEach {
|
||||
tempAndMove(true)
|
||||
}
|
||||
|
||||
// Opt-out for VLC bundling. CI (build.yml) and ephemeral build sandboxes
|
||||
// (Claude Code web) routinely lose connectivity to get.videolan.org and the
|
||||
// retry budget above is not enough to mask it. Setting `-PskipVlcSetup=true`
|
||||
// (or env `AMETHYST_SKIP_VLC=true`) disables the vlc/upx download + extract
|
||||
// tasks so packaging proceeds without bundling VLC. The release workflow
|
||||
// (create-release.yml) does NOT set this, so production artifacts still ship
|
||||
// with VLC bundled.
|
||||
val skipVlcSetup =
|
||||
(project.findProperty("skipVlcSetup") as? String)?.toBoolean() == true ||
|
||||
System.getenv("AMETHYST_SKIP_VLC") == "true"
|
||||
|
||||
if (skipVlcSetup) {
|
||||
logger.lifecycle("desktopApp: skipVlcSetup=true — disabling vlc-setup plugin tasks. Built artifacts will NOT bundle VLC.")
|
||||
val vlcPluginTasks = setOf(
|
||||
"vlcDownload",
|
||||
"vlcExtract",
|
||||
"vlcFilterPlugins",
|
||||
"vlcCompressPlugins",
|
||||
"upxDownload",
|
||||
"upxExtract",
|
||||
"vlcSetup",
|
||||
)
|
||||
tasks.matching { it.name in vlcPluginTasks }.configureEach {
|
||||
enabled = false
|
||||
}
|
||||
}
|
||||
|
||||
// --- AppImage packaging (Linux) ---
|
||||
//
|
||||
// Compose Multiplatform's TargetFormat.AppImage is known-broken in 1.10.x (CMP-7101).
|
||||
|
||||
Reference in New Issue
Block a user