Skip to content

Merge develop to master #73

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

Jump to bottom
Merged
jamalex merged 72 commits into from
Aug 21, 2020
Merged

Merge develop to master #73

jamalex merged 72 commits into from
Aug 21, 2020

Conversation

@jamalex
Copy link
Member

@jamalex jamalex commented Aug 21, 2020

DXCanas and others added 30 commits March 28, 2020 15:24
@DXCanas
Update makefile target name
91b6586 
Also add notes
@DXCanas
WIP: Isolate docker build more deeply
937160d 
Added effect of improving Makefile for local dev.
A more traitional build approach. No longer _has_ to bind mount, etc.
@DXCanas
Invalide vendor cache and persist android distro
f4a87fc 
Using docker ADD to invalidate pip install cache,
will update if downloaded zips have changed.
Also setting up volumes to persist android downloads between builds.
@jamalex
Slight refactor and cleanup, and consolidating Android-specific code.
9ed4cde
@kollivier
Merge pull request #50 from DXCanas/dev-cache-improvements
b475d49 
Dev Cache/Build Overhaul
@DXCanas
Using cidfile option to store Container ID
64f9cae 
Rather than relying on CLI output.
To address issues where output is not as expected in docker.
@DXCanas
Merge pull request #51 from DXCanas/dev-cache-improvements
e3f112c 
Using cidfile option to store Container ID
@jamalex
Switch Kolibri server start to a separate persistent foreground service
08d865c
@jamalex
Merge branch 'develop' of github.com:learningequality/kolibri-install…
3fc3967 
…er-android into develop

# Conflicts:
#	Dockerfile
@jamalex
Pass version name in via service arguments
ec341bc
@jamalex
Add extra_build_options for configuring service
6b71325
@jamalex
Add custom settings file and have it never expire the session
96290bd
@jamalex
Copy pre-migrated DB into Kolibri data directory to speed up startup
ffde26a
@jamalex
Add SDK version to project info
006b56f
@kollivier
Merge pull request #52 from jamalex/develop
0fe17ee 
Switch Kolibri server start to a separate persistent foreground service
@jamalex
Start server as thread, and add pre-seeding of KOLIBRI_HOME directory
ae82992
@jamalex
Add KOLIBRI_HOME preseeding to kolibri.apk target for docker build
5742163
@jamalex
Load time optimization: blacklist 63% of source files from Kolibri whl
6420fb4
@jamalex
Update loading page to use smoother SVG animation
8733455
@jamalex
Refactor code into utility files (general/android) and clean things up
3332415
@jamalex
Clean up makefile, add minsdk, and main.py fix
c8f3a4a
@jamalex
In-progress updates for WhatsApp file sharing
44cd7af
@jamalex
Merge branch 'develop' of github.com:learningequality/kolibri-install…
bd1252e 
…er-android into develop
@jamalex
Py3-ification.
de041f0
@jamalex
Point Dockerfile to temporary development branches of p4a and pew
839bd98
@jamalex
Upgrade urllib reference to Python 3
8dc0e1a
@jamalex
Update foreground service notification code to work in API level >= 26
679c84f
@jamalex
Fully functioning file sharing via Flask server and intents
92ea5c8
@kollivier
Add arch argument to makefile.
741228a
@jamalex
Merge pull request #56 from kollivier/arch_mehearty
2e6c938 
Add arch argument to makefile.
DXCanas and others added 28 commits April 25, 2020 13:03
@DXCanas
Using LE-defined envvar instead of Buildkite builtin.
add303b 
For pipeline. Allows for manual whl specification
@jamalex
Fix env format in pipeline.yml
e397635
@jamalex
triggering a new build
b057ca1
@jamalex
Switch order of pew arguments as a temp fix to get signing working
f292d99
@jamalex
Update docker repo-based cache invalidation to use same branches
2e2f38b
@jamalex
Make sure the Docker build is from scratch on a per-architecture basis
790b9d8
@jamalex
Make docker P4A cache arch-specific
95d1535
@jamalex
Merge pull request #58 from jamalex/upload_any_apk
87562b7 
Add support for 64bit builds via docker and add to Buildkite pipeline
@DXCanas
Adding pbxproj dependency to python environment.
cf615a0
@DXCanas
Removing release-specifying envvars
1c5a25f 
The scripts those vars trigger will no longer work, and will break the build if run.
@DXCanas
Merge pull request #64 from DXCanas/fix-automated-builds
3d07473 
Fix Automated Builds
@DXCanas
Using LE_KOLIBRI_RELEASE envar to conditionalize trigger step.
2e868f6
@DXCanas
Merge pull request #66 from DXCanas/use-le-release-envar
bc86856 
Using LE_KOLIBRI_RELEASE envar to conditionalize trigger step.
@DXCanas
Correcting envar syntac for bk conditional
3dd3236
@DXCanas
Correcting envar condition
4a80194
@DXCanas
Configure conditional to always run build when triggered by gh
e15bd14
@DXCanas
Simplifying build block conditional further.
084ad42
@DXCanas
Adding temporary check for unstandard envar
5e4df0d 
Adding a few more explanatory comments
@DXCanas
Commenting out upload to parent pipeline step - we don't want it incl…
fdc368b 
…uded in the release page.
@kollivier
Fix symlink issue and update blacklist after style guide changes.
469af47
@kollivier
Merge pull request #67 from kollivier/symlink_fix
8a3d778 
Fix symlink issue and update blacklist after style guide changes.
@kollivier
Add support for app plugin.
d35bdfb
@kollivier
Update blacklist and tweak the parameters to match app plugin messages.
aa724d2
@kollivier
Merge pull request #68 from kollivier/app_plugin
93dbf21 
App plugin
@jamalex
Add twisted manhole to provide remote provisioning/debugging shell
17055b3
@jamalex
Merge pull request #71 from jamalex/manhole
6c0a12e 
Add twisted manhole to provide remote provisioning/debugging shell
@jamalex
Set KOLIBRI_RUN_MODE based on signing key for APK (dev, testing, prod)
c9306c9
@jamalex
Merge pull request #72 from jamalex/run_mode
643a9c9 
Set KOLIBRI_RUN_MODE based on signing key for APK (dev, testing, prod)
@jamalex jamalex merged commit 91cf100 into master Aug 21, 2020
@armantaj armantaj mentioned this pull request Aug 23, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jamalex @DXCanas @kollivier