tutor/tutor-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: build main branch in nightly

Browse Source
This commit is contained in:
Hamza Shafique 2024-06-11 12:14:33 +05:00 committed by GitHub
parent b5d60b812c
commit 5f10cfe451
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/20240610_212617_hamzashafiquehere_dynamic_android_app_version.md Normal file
View File

@ -0,0 +1 @@
- [Feature] Enhanced `ANDROID_APP_VERSION` logic to dynamically set the version based on `OPENEDX_COMMON_VERSION`: For nightly builds, `ANDROID_APP_VERSION` is set to main. For other builds, `ANDROID_APP_VERSION` is set to the value of `OPENEDX_COMMON_VERSION`. (by @hamza-56)

3
tutorandroid/templates/android/build/Dockerfile
View File

@ -35,8 +35,7 @@ RUN yes | /app/android-sdk/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_HOM
FROM base AS code FROM base AS code
# Install android app repo # Install android app repo
ARG ANDROID_APP_REPOSITORY=https://github.com/openedx/openedx-app-android.git ARG ANDROID_APP_REPOSITORY=https://github.com/openedx/openedx-app-android.git
# Always use the 'main' branch ARG ANDROID_APP_VERSION={% if OPENEDX_COMMON_VERSION == "master" %}main{% else %}{{ OPENEDX_COMMON_VERSION }}{% endif %}
ARG ANDROID_APP_VERSION=main
ADD --keep-git-dir $ANDROID_APP_REPOSITORY#$ANDROID_APP_VERSION /app/openedx-app-android ADD --keep-git-dir $ANDROID_APP_REPOSITORY#$ANDROID_APP_VERSION /app/openedx-app-android
###### Empty layer to mount custom repo at build time ###### Empty layer to mount custom repo at build time