From 2687e72643e675c128a73d76647ddae72a1345b7 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 8 Nov 2024 16:42:29 +0400 Subject: [PATCH 1/4] support minimal runphp --- dk | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dk b/dk index d158eee..a12b638 100755 --- a/dk +++ b/dk @@ -2099,8 +2099,10 @@ function auto_composer() { esac done - local use_image - if [ "$COMPOSER_PHP" == force -o "$COMPOSER_PHP" == any ]; then + local use_runphp use_image + if [ "$COMPOSER_PHP" == runphp ]; then + use_runphp=1 + elif [ "$COMPOSER_PHP" == force -o "$COMPOSER_PHP" == any ]; then use_image=1 elif [ "$COMPOSER_PHP" == none -o "$COMPOSER_PHP" == system ]; then COMPOSER_PHP=none @@ -2121,7 +2123,7 @@ exit((PHP_VERSION_ID > $version)? 0: 1); *) ewarn "Erreur lors du lancement de PHP: est-il installé? Vous pouvez utiliser COMPOSER_PHP=any";; esac fi - if [ -n "$use_image" -o "$COMPOSER_PHP" == none ]; then + if [ -n "$use_runphp" -o -n "$use_image" -o "$COMPOSER_PHP" == none ]; then : # ok, on a déjà décidé elif [ -z "$COMPOSER_PHP" ]; then # pas de version minimum, tester simplement la valeur de COMPOSER_IMAGE @@ -2143,7 +2145,23 @@ exit((PHP_VERSION_ID < $version)? 0: 1); esac fi - if [ -n "$use_image" ]; then + if [ -n "$use_runphp" ]; then + ( + export PROJDIR="$(pwd)" + export RUNPHP_STANDALONE= + RUNPHP=; DIST=; REGISTRY= + if [ -f "$PROJDIR/.runphp.conf" ]; then + source "$PROJDIR/.runphp.conf" + [ -n "$RUNPHP" ] && exec "$PROJDIR/$RUNPHP" composer "$@" + elif [ -f "$PROJDIR/sbin/runphp" ]; then + exec "$PROJDIR/sbin/runphp" composer "$@" + elif [ -f "$PROJDIR/runphp" ]; then + exec "$PROJDIR/runphp" composer "$@" + fi + exec runphp composer "$@" + ) + + elif [ -n "$use_image" ]; then [ "$COMPOSER_IMAGE" != none ] || die "Vous devez spécifier l'image à utiliser pour composer" local PREVIOUS_DOCKER_MACHINE_NAME="$DOCKER_MACHINE_NAME" From 737179b81b4b4ca6d0a0137dcd3e8c7ed3848843 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Tue, 17 Dec 2024 13:12:42 +0100 Subject: [PATCH 2/4] modifs.mineures sans commentaires --- TODO.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/TODO.md b/TODO.md index a57d611..dbc71f0 100644 --- a/TODO.md +++ b/TODO.md @@ -7,4 +7,19 @@ dkbuild * si cela a du sens, une commande setlatest qui permet de désigner quelle distribution/version est la dernière + +git push +* ajouter le support pour le mode DEBUG + ~~~ + export GIT_TRACE=1 + export GIT_TRANSFER_TRACE=1 + export GIT_CURL_VERBOSE=1 + ~~~ +* ajouter le support http basique pour git lfs en cas de problème pour upload de certains fichiers + ~~~ + git config --add lfs.basictransfersonly true + ~~~ + ou le mettre dans un fichier .lfsconfig + cf https://github.com/git-lfs/git-lfs/blob/main/docs/man/git-lfs-config.adoc + -*- coding: utf-8 mode: markdown -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8:noeol:binary \ No newline at end of file From b9f264f705698b82e0328f30807afb26a24649b9 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Tue, 31 Dec 2024 15:05:43 +0400 Subject: [PATCH 3/4] bug avec dkbuild -e --- dkbuild | 14 ++++++-------- lib/dkbuild/tests/{test-vars => test-vars0} | 2 +- lib/dkbuild/tests/test-vars1 | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 9 deletions(-) rename lib/dkbuild/tests/{test-vars => test-vars0} (83%) create mode 100644 lib/dkbuild/tests/test-vars1 diff --git a/dkbuild b/dkbuild index 72ccfb9..bcfc069 100755 --- a/dkbuild +++ b/dkbuild @@ -1603,6 +1603,10 @@ function resolve_dists_profiles() { edebug "Calcul de la version par défaut" reset_functions define_functions_env + + setenv "${TMPENVIRON[@]}" + setarg "${TMPARGS[@]}" + setarg "$@" load_dkbuild } @@ -2973,10 +2977,7 @@ function build_action() { set_machine "$machine" ensure_projdir - resolve_dists_profiles - setenv "${TMPENVIRON[@]}" - setarg "${TMPARGS[@]}" - setarg "$@" + resolve_dists_profiles "$@" if [ -n "$clean_update" ]; then edebug "clean" @@ -3145,10 +3146,7 @@ function dump_action() { set_machine "$machine" ensure_projdir - resolve_dists_profiles - setenv "${TMPENVIRON[@]}" - setarg "${TMPARGS[@]}" - setarg "$@" + resolve_dists_profiles "$@" foreach_dists_profiles _dump_each _dump_before _dump_after } diff --git a/lib/dkbuild/tests/test-vars b/lib/dkbuild/tests/test-vars0 similarity index 83% rename from lib/dkbuild/tests/test-vars rename to lib/dkbuild/tests/test-vars0 index 8ac58fe..f766e20 100644 --- a/lib/dkbuild/tests/test-vars +++ b/lib/dkbuild/tests/test-vars0 @@ -8,7 +8,7 @@ info "A=$A, B=$B" if [ "$A" != x ]; then note "\ Essayer de relancer avec - $(qvals dkbuild -j "$(relpath "$DKBUILD")" -e A=x -e B=y) + $(qvals "$0" -j "$(relpath "$DKBUILD")" -e A=x -e B=y) on ne devrait pas pouvoir modifier la valeur de B" fi diff --git a/lib/dkbuild/tests/test-vars1 b/lib/dkbuild/tests/test-vars1 new file mode 100644 index 0000000..1cf5599 --- /dev/null +++ b/lib/dkbuild/tests/test-vars1 @@ -0,0 +1,15 @@ +# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 + +setenv dne=1 +setenv de= + +info "dne=$dne de=$de" +if [ -n "$dne" -o -z "$de" ]; then + note "\ +Relancer avec + $(qvals "$0" -j "$(relpath "$DKBUILD")" -e dne= -e de=1) +pour vérifier qu'on peut changer la valeur avec les options en ligne de commande" +fi + +# pas de build automatique +AUTOBUILD= From c69e3d414f685f711cd4fac46d83846045ef8a4d Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Tue, 31 Dec 2024 15:05:57 +0400 Subject: [PATCH 4/4] Init changelog & version 11.3.1 --- CHANGES.md | 6 ++++++ VERSION.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 059e3ee..a493462 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +## Version 11.3.1 du 31/12/2024-15:05 + +* `b9f264f` bug avec dkbuild -e +* `737179b` modifs.mineures sans commentaires +* `2687e72` support minimal runphp + ## Version 11.3.0 du 24/09/2024-16:02 * `625d5f1` bug mineur diff --git a/VERSION.txt b/VERSION.txt index f628d2e..0a47c95 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -11.3.0 +11.3.1