From 5bd95862727b877f56210e7da94693ecb3919a83 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Thu, 20 Feb 2025 10:13:53 +0400 Subject: [PATCH] =?UTF-8?q?d=C3=A9but=20scripts=20release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin_wip/_merge82 | 29 +++++++++++++++++++++ bin_wip/_rel | 62 +++++++++++++++++++++++++++++++++++++++++++++ bin_wip/_rel.conf | 7 +++++ bin_wip/_rel74 | 1 + bin_wip/_rel74.conf | 7 +++++ bin_wip/_rel82 | 1 + bin_wip/_rel82.conf | 7 +++++ 7 files changed, 114 insertions(+) create mode 100755 bin_wip/_merge82 create mode 100755 bin_wip/_rel create mode 100644 bin_wip/_rel.conf create mode 120000 bin_wip/_rel74 create mode 100644 bin_wip/_rel74.conf create mode 120000 bin_wip/_rel82 create mode 100644 bin_wip/_rel82.conf diff --git a/bin_wip/_merge82 b/bin_wip/_merge82 new file mode 100755 index 0000000..1d8fd53 --- /dev/null +++ b/bin_wip/_merge82 @@ -0,0 +1,29 @@ +#!/bin/bash +# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 +source "$(dirname -- "$0")/../load.sh" || exit 1 +require: git + +eval "$(source "$MYDIR/_rel74.conf"; echo_setv Source="$DEVELOP")" +eval "$(source "$MYDIR/_rel82.conf"; echo_setv Dest="$DEVELOP")" + +Remote= +args=( + "fusionner la branche $Source dans $Dest" + -d:,--chdir:BASEDIR chdir= "répertoire dans lequel se placer avant de lancer les opérations" + -o:,--remote Remote= "++spécifier le remote vers lequel pousser les branches" +) +parse_args "$@"; set -- "${args[@]}" + +if [ -n "$chdir" ]; then + cd "$chdir" || die +fi + +git_check_gitvcs || die "\ +$(ppath "$(pwd)" ~): ce répertoire n'est pas un dépôt git" +git_check_cleancheckout || die "\ +Impossible de fusionner car il y a des modifications locales. +Enregistrer les modifications et réessayez" + +setx branch=git_get_branch + +estep "Merge $Source --> $Dest" diff --git a/bin_wip/_rel b/bin_wip/_rel new file mode 100755 index 0000000..e0b0e97 --- /dev/null +++ b/bin_wip/_rel @@ -0,0 +1,62 @@ +#!/bin/bash +# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 +source "$(dirname -- "$0")/../load.sh" || exit 1 +require: git + +DEVELOP=develop +FEATURE=wip/ +RELEASE=release- +MAIN=master +HOTFIX=hotfix- +source "$MYDIR/${MYNAME%.sh}.conf" + +function init_action() { + : +} + +function list_action() { + : +} + +function release_action() { + : +} + +chdir= +Remote= +action=list +args=( + "faire une nouvelle release" + " -rv VERSION" + -d:,--chdir:BASEDIR chdir= "répertoire dans lequel se placer avant de lancer les opérations" + -o:,--remote Remote= "++spécifier le remote vers lequel pousser les branches" + --init action=init "++initialiser les branches $DEVELOP et $MAIN" + --list action=list "lister les modifications qui seraient intégrées dans la release" + -r,--release action=release "faire la release" + -v:,--version Version= "spécifier la version de la release" +) +parse_args "$@"; set -- "${args[@]}" + +if [ -n "$chdir" ]; then + cd "$chdir" || die +fi + +git_check_gitvcs || die "$(ppath "$(pwd)" ~): ce répertoire n'est pas un dépôt git" +setx branch=git_get_branch +case "$branch" in +"$DEVELOP") current=develop;; +"$FEATURE"*) current=feature;; +"$RELEASE"*) current=release;; +"$MAIN") current=main;; +"$HOTFIX"*) current=hotfix;; +*) ewarn "$branch: branche courante non reconnue";; +esac + +case "$action" in +init) init_action "$@";; +list) list_action "$@";; +release) + [ -n "$Version" ] || die "Vous devez spécifier la version de la release" + release_action "$@" + ;; +esac diff --git a/bin_wip/_rel.conf b/bin_wip/_rel.conf new file mode 100644 index 0000000..ce53acd --- /dev/null +++ b/bin_wip/_rel.conf @@ -0,0 +1,7 @@ +# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 + +DEVELOP=develop +FEATURE=wip/ +RELEASE=release- +MAIN=master +HOTFIX=hotfix- diff --git a/bin_wip/_rel74 b/bin_wip/_rel74 new file mode 120000 index 0000000..99051fd --- /dev/null +++ b/bin_wip/_rel74 @@ -0,0 +1 @@ +_rel \ No newline at end of file diff --git a/bin_wip/_rel74.conf b/bin_wip/_rel74.conf new file mode 100644 index 0000000..aa3d41d --- /dev/null +++ b/bin_wip/_rel74.conf @@ -0,0 +1,7 @@ +# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 + +DEVELOP=dev74 +FEATURE=wip74/ +RELEASE=rel74- +MAIN=dist74 +HOTFIX=hotf74- diff --git a/bin_wip/_rel82 b/bin_wip/_rel82 new file mode 120000 index 0000000..99051fd --- /dev/null +++ b/bin_wip/_rel82 @@ -0,0 +1 @@ +_rel \ No newline at end of file diff --git a/bin_wip/_rel82.conf b/bin_wip/_rel82.conf new file mode 100644 index 0000000..c673fae --- /dev/null +++ b/bin_wip/_rel82.conf @@ -0,0 +1,7 @@ +# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 + +DEVELOP=dev82 +FEATURE=wip82/ +RELEASE=rel82- +MAIN=dist82 +HOTFIX=hotf82-