Skip to content

Fix redundant git clone and build delays in setup-workspace.sh #4290

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

Merged
shai-almog merged 5 commits into from
Dec 17, 2025
Merged

Fix redundant git clone and build delays in setup-workspace.sh #4290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0cc2f3c
Fix redundant profile activation in setup-workspace.sh
google-labs-jules[bot] Dec 17, 2025
e8df7fb
Optimize setup-workspace.sh performance
google-labs-jules[bot] Dec 17, 2025
440d049
Optimize setup-workspace.sh and trigger CI on changes
google-labs-jules[bot] Dec 17, 2025
d537116
Fix Android port build script and PR CI triggers
google-labs-jules[bot] Dec 17, 2025
6625b2e
Fix Android port build scripts and CI triggers
google-labs-jules[bot] Dec 17, 2025
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: 2 additions & 0 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '.github/workflows/scripts-android.yml'
- '.github/workflows/scripts-ios.yml'
- 'scripts/**'
- '!scripts/setup-workspace.sh'
- 'docs/**'
- '**/*.md'
- '.github/workflows/developer-guide-docs.yml'
Expand All @@ -20,6 +21,7 @@ on:
- '.github/workflows/scripts-android.yml'
- '.github/workflows/scripts-ios.yml'
- 'scripts/**'
- '!scripts/setup-workspace.sh'
- 'docs/**'
- '**/*.md'
- '.github/workflows/developer-guide-docs.yml'
Expand Down
11 changes: 9 additions & 2 deletions scripts/build-android-port.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ TMPDIR="${TMPDIR%/}"
DOWNLOAD_DIR="${TMPDIR%/}/codenameone-tools"
log "The DOWNLOAD_DIR is ${DOWNLOAD_DIR}"

CN1_BINARIES_PARENT="$(cd .. && pwd -P)"
CN1_BINARIES="${CN1_BINARIES_PARENT%/}/cn1-binaries"
if [ ! -d "$CN1_BINARIES" ]; then
# Fallback to the maven build dir if the external one doesn't exist
CN1_BINARIES="$(pwd)/maven/target/cn1-binaries"
fi

ENV_DIR="$DOWNLOAD_DIR/tools"
ENV_FILE="$ENV_DIR/env.sh"

Expand Down Expand Up @@ -119,9 +126,9 @@ run_maven() {

BUILD_CLIENT="$HOME/.codenameone/CodeNameOneBuildClient.jar"
if [ ! -f "$BUILD_CLIENT" ]; then
if ! run_maven -q -f maven/pom.xml cn1:install-codenameone "$@"; then
if ! run_maven -q -f maven/pom.xml -Dcn1.binaries="$CN1_BINARIES" -P !download-cn1-binaries cn1:install-codenameone "$@"; then
[ -f maven/CodeNameOneBuildClient.jar ] && cp maven/CodeNameOneBuildClient.jar "$BUILD_CLIENT" || true
fi
fi

run_maven -q -f maven/pom.xml -pl android -am -Dmaven.javadoc.skip=true -Djava.awt.headless=true clean install "$@"
run_maven -q -f maven/pom.xml -pl android -am -Dcn1.binaries="$CN1_BINARIES" -P !download-cn1-binaries -T 1C -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Djava.awt.headless=true clean install "$@"
9 changes: 6 additions & 3 deletions scripts/setup-workspace.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,18 +226,21 @@ if [ ! -d "$CN1_BINARIES/.git" ]; then
fi

log "Building Codename One core modules"
"$MAVEN_HOME/bin/mvn" -f maven/pom.xml -DskipTests -Djava.awt.headless=true -Dcn1.binaries="$CN1_BINARIES" -Dcodename1.platform=javase -P local-dev-javase,compile-android install "$@"
"$MAVEN_HOME/bin/mvn" -f maven/pom.xml -T 1C -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -Djava.awt.headless=true -Dcn1.binaries="$CN1_BINARIES" -Dcodename1.platform=javase -P local-dev-javase,compile-android,!download-cn1-binaries install "$@"

log "Building Codename One Maven plugin"
"$MAVEN_HOME/bin/mvn" -f maven/pom.xml \
-pl codenameone-maven-plugin -am \
-T 1C -Dmaven.javadoc.skip=true -Dmaven.source.skip=true \
-DskipTests -Djava.awt.headless=true \
-Dcn1.binaries="$CN1_BINARIES" \
-P !download-cn1-binaries \
install "$@"

BUILD_CLIENT="$HOME/.codenameone/CodeNameOneBuildClient.jar"
log "Ensuring CodeNameOneBuildClient.jar is installed"
if [ ! -f "$BUILD_CLIENT" ]; then
if ! "$MAVEN_HOME/bin/mvn" -f maven/pom.xml cn1:install-codenameone "$@"; then
if ! "$MAVEN_HOME/bin/mvn" -f maven/pom.xml -Dcn1.binaries="$CN1_BINARIES" -P !download-cn1-binaries cn1:install-codenameone "$@"; then
log "Falling back to copying CodeNameOneBuildClient.jar"
mkdir -p "$(dirname "$BUILD_CLIENT")"
cp maven/CodeNameOneBuildClient.jar "$BUILD_CLIENT" || true
Expand Down Expand Up @@ -272,6 +275,6 @@ if [ "${skip_archetypes:-0}" -eq 0 ]; then
log "Updating cn1-maven-archetypes version from $current_version to $CN1_VERSION to match local snapshot"
"$MAVEN_HOME/bin/mvn" -q -B versions:set -DnewVersion="$CN1_VERSION" -DgenerateBackupPoms=false
fi
"$MAVEN_HOME/bin/mvn" -DskipTests -DskipITs=true -Dinvoker.skip=true install
"$MAVEN_HOME/bin/mvn" -T 1C -DskipTests -DskipITs=true -Dinvoker.skip=true install
) || log "Archetype mvn install failed; continuing."
fi
Loading