Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
186 changes: 93 additions & 93 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ no-ops in CI, so they do not change what CI runs.
(their toolchains are x86_64-only), so they always run emulated.

* `-PtargetPlatforms=<list>` — build only these targets, and boot only the builders they need.
Values: `x86_64-linux`, `armv7-android`, `arm64-android`, `js-web`, `wasm-web`, `x86_64-win32`.
Values: `x86_64-linux`, `armv7-android`, `arm64-android`, `x86_64-android`, `js-web`, `wasm-web`, `x86_64-win32`.
* `-PdefoldVersions=<list>` — which Defold SDK versions to test. `latest`, `ci` (first + last, what
CI uses), `all`, or a comma list like `1.12.3,1.11.1`.
* `-PreuseStack=true` — leave the docker stack running after the tests and reuse it next time. The
Expand Down
4 changes: 1 addition & 3 deletions server/docker/Dockerfile.android.ndk25-env
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \
rm -rf "${ANDROID_NDK25_PATH}/sources/third_party" && \
rm -rf "${ANDROID_NDK25_PATH}/sources/cxx-stl" && \
rm -rf "${ANDROID_NDK25_PATH}/toolchains/llvm/prebuilt/linux-x86_64/i686-linux-android" && \
rm -rf "${ANDROID_NDK25_PATH}/toolchains/llvm/prebuilt/linux-x86_64/x86_64-linux-android" && \
rm -rf "${ANDROID_NDK25_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-*" && \
rm -rf "${ANDROID_NDK25_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-*" && \
rm -rf "${ANDROID_NDK25_PATH}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android" && \
rm -rf "${ANDROID_NDK25_PATH}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android" && \
# create the .android folder and give read+write permissions (the Android Gradle plugin will write to the folder)
# It is not enough to give 'user' and 'group'. We unfortunately also need 'others'
Expand All @@ -66,6 +63,7 @@ RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \
# check that dx installed properly
which "${ANDROID_NDK25_BIN_PATH}/armv7a-linux-androideabi${ANDROID_NDK25_API_VERSION}-clang++" && \
which "${ANDROID_NDK25_BIN_PATH}/aarch64-linux-android${ANDROID_64_NDK25_API_VERSION}-clang++" && \
which "${ANDROID_NDK25_BIN_PATH}/x86_64-linux-android${ANDROID_64_NDK25_API_VERSION}-clang++" && \
# check that aapt installed correctly
"${ANDROID_SDK_BUILD_TOOLS_PATH_34}/aapt2" version && \
# download and install R8 utility separatly. It's done in that way because
Expand Down
4 changes: 1 addition & 3 deletions server/docker/Dockerfile.android.ndk25_sdk36-env
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@ RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \
rm -rf "${ANDROID_NDK_PATH}/sources/third_party" && \
rm -rf "${ANDROID_NDK_PATH}/sources/cxx-stl" && \
rm -rf "${ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/i686-linux-android" && \
rm -rf "${ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/x86_64-linux-android" && \
rm -rf "${ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-*" && \
rm -rf "${ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-*" && \
rm -rf "${ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android" && \
rm -rf "${ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android" && \
# create the .android folder and give read+write permissions (the Android Gradle plugin will write to the folder)
# It is not enough to give 'user' and 'group'. We unfortunately also need 'others'
Expand All @@ -58,6 +55,7 @@ RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \
chmod -R 755 "${ANDROID_ROOT}/android-ndk-r${ANDROID_NDK_VERSION}" && \
which "${ANDROID_NDK_BIN_PATH}/armv7a-linux-androideabi${ANDROID_NDK_API_VERSION}-clang++" && \
which "${ANDROID_NDK_BIN_PATH}/aarch64-linux-android${ANDROID_64_NDK_API_VERSION}-clang++" && \
which "${ANDROID_NDK_BIN_PATH}/x86_64-linux-android${ANDROID_64_NDK_API_VERSION}-clang++" && \
# check that aapt installed correctly
"${ANDROID_SDK_BUILD_TOOLS_PATH}/aapt2" version && \
# download and install R8 utility separatly. It's done in that way because
Expand Down
Loading