Skip to content
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.

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

0.118: bump bootstraps to v2024.06.09-r1 #4005

Closed
wants to merge 1 commit into from

Conversation

Grimler91
Copy link
Member

@Grimler91 Grimler91 commented Jun 9, 2024

Installation and pkg/apt usage, and general use, works fine on both arm and aarch64

And append "+apt-android-7" to download url, as bootstraps these days
normally support both >= android-5 and >= android-7.
@Grimler91
Copy link
Member Author

Running tests from termux/termux-exec#24 succeeds if I remove --ld-preload arg and just install and use libtermux-exec.so from $PREFIX/lib/ instead, that is I apply:

diff --git a/Makefile b/Makefile
index afc3d63..cf5769e 100644
--- a/Makefile
+++ b/Makefile
@@ -178,7 +178,7 @@ deb: all
 
 test: all
        $(MAKE) TERMUX_EXEC__INSTALL_PREFIX=install install
-       tests/termux-exec-tests --ld-preload="install/lib/libtermux-exec.so" --tests-path="install/libexec/installed-tests/termux-exec" -vvv all
+       tests/termux-exec-tests --tests-path="install/libexec/installed-tests/termux-exec" -vvv all
 
 test-unit: all
        $(MAKE) TERMUX_EXEC__INSTALL_PREFIX=install install
@@ -186,7 +186,7 @@ test-unit: all
 
 test-runtime: all
        $(MAKE) TERMUX_EXEC__INSTALL_PREFIX=install install
-       tests/termux-exec-tests --ld-preload="install/lib/libtermux-exec.so" --tests-path="install/libexec/installed-tests/termux-exec" -vvv runtime
+       tests/termux-exec-tests --tests-path="install/libexec/installed-tests/termux-exec" -vvv runtime
 
 
 

haven't tested with termux-api and termux-am, but otherwise all tests succeed on both arm and aarch64
arm.log
aarch64.log

@fornwall
Copy link
Member

Ok to merge and tag a 0.118.1 release?

Would be nice to get it out to fix the issue of people being prompted for updating away from F-Droid to Google Play. See also #4012 (comment) - a systematic version code scheme can come later perhaps.

@Grimler91
Copy link
Member Author

I think @agnostic-apollo mentioned that it would be good to cherry-pick some additional fixes/improvements from master before tagging a release, for example workflows so that apk's are built and uploaded to the new release

@agnostic-apollo
Copy link
Member

Workflow is broken in master branch too, I fixed it in my local master branch a while back and have also fixed it in my new local release branch.

@agnostic-apollo
Copy link
Member

@Grimler91 Found the reason for make test failing after exporting TERMUX_EXEC__LOG_LEVEL=4.

Termux.exec: Failed to access executable path '/data/data/com.termux/files/usr/libexec/installed-tests/termux-exec/files/exec/print-args-binary': No such file or directory 

Even though the test files path was passed to termux-exec-tests with --tests-path to the install sub directory under source directory, the runtime-binary-tests.c was using hardcoded (macro) tests paths under $PREFIX/libexexec/* and then failed to find the paths. I have fixed it by making it check the TERMUX_EXEC__TESTS_PATH env variable to see if its set (with fallback to macro) and dynamically generating the test file paths.

Another error was that LD_PRELOAD being passed with --ld-preload wasn't converted to an absolute path, which then failed due to linking error for later bash tests.

@twaik
Copy link
Member

twaik commented Jun 17, 2024

Probably it will be a good idea to update release with newest bootstrap with same version but bumped versionCode, without making any new commits to release code. So both f-droid and github releases will have newest bootstrap even if the apk code was not changed.

@agnostic-apollo agnostic-apollo deleted the 0.118-update-bootstraps branch June 18, 2024 00:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants