Skip to content

fix/ADFA-3960 run bundlellamaassets for release builds only otherwise skip #1299

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.

Sign up for GitHub

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

Open
jomen-adfa wants to merge 4 commits into
base: stage
Choose a base branch
from
Open

fix/ADFA-3960 run bundlellamaassets for release builds only otherwise skip #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40b0be3
enable bundlellamaassets for release only otherwise skip
jomen-adfa May 13, 2026
9ca2517
use INCLUDE_LLAMA_ASSETS instead of SKIP_LLAMA_ASSETS
jomen-adfa May 13, 2026
a4ae87d
flip the env var logic
jomen-adfa May 13, 2026
55f944d
simplify
jomen-adfa May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
needs: check_changes
if: needs.check_changes.outputs.must_build == 'true'
env:
SKIP_LLAMA_ASSETS: "true"
INCLUDE_LLAMA_ASSETS: "false"

steps:

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,8 @@ jobs:
echo "google-services.json created successfully"

- name: Assemble Release APK
env:
INCLUDE_LLAMA_ASSETS: "true"
run: |
variant_upper=$(echo "${{ matrix.variant }}" | tr '[:lower:]' '[:upper:]')
flox activate -d flox/base -- ./gradlew :app:assemble${variant_upper}Release --no-daemon \
Expand Down
14 changes: 7 additions & 7 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,13 +774,13 @@ tasks.register("recompressApk") {
val isCiCd = System.getenv("GITHUB_ACTIONS") == "true"

val skipLlamaAssets =
providers
.environmentVariable("SKIP_LLAMA_ASSETS")
.map { it.equals("true", ignoreCase = true) }
.getOrElse(false)
!System.getenv("INCLUDE_LLAMA_ASSETS")
.equals("true", ignoreCase = true)

if (skipLlamaAssets) {
project.logger.lifecycle("SKIP_LLAMA_ASSETS enabled - debug assemble tasks will skip llama asset bundling.")
project.logger.lifecycle("INCLUDE_LLAMA_ASSETS is disabled - debug assemble tasks will skip llama asset bundling.")
} else {
project.logger.lifecycle("INCLUDE_LLAMA_ASSETS enabled - assemble tasks will do llama asset bundling.")
}

val noCompress =
Expand Down Expand Up @@ -865,7 +865,7 @@ afterEvaluate {
if (!skipLlamaAssets) {
dependsOn(bundleLlamaV8Assets)
}
if (!isCiCd) {
if (!isCiCd && !skipLlamaAssets) {
dependsOn("assetsDownloadDebug")
}
Comment thread
jomen-adfa marked this conversation as resolved.
}
Expand All @@ -888,7 +888,7 @@ afterEvaluate {
if (!skipLlamaAssets) {
dependsOn(bundleLlamaV7Assets)
}
if (!isCiCd) {
if (!isCiCd && !skipLlamaAssets) {
dependsOn("assetsDownloadDebug")
}
}
Expand Down
Loading