From 6da0922c3857db812c2dce7eb6452188164e402a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@inrae.fr> Date: Mon, 29 Jun 2020 16:29:37 +0200 Subject: [PATCH] =?UTF-8?q?Inclut=20bin/prezbuilder-docker=20dans=20les=20?= =?UTF-8?q?fichiers=20=C3=A0=20modifier=20pour=20les=20releases.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/release | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/release b/bin/release index 6f7d45c..d00b45e 100755 --- a/bin/release +++ b/bin/release @@ -1,11 +1,10 @@ #!/usr/bin/env bash TAG="$1" git checkout -f -b "release-$TAG" master -sed -i -e "s/master/$TAG/g" prezbuilder-ci.yml src/index.md README.md -git add prezbuilder-ci.yml src/index.md README.md +sed -i -e "s/master/$TAG/g" prezbuilder-ci.yml src/index.md README.md bin/prezbuilder-docker +git add prezbuilder-ci.yml src/index.md README.md bin/prezbuilder-docker git commit -m "Prépare la release $TAG" git tag -f "$TAG" -m "Release $TAG" git checkout master git merge --no-ff -s ours "release-$TAG" -m "Merge release branch $TAG" git branch -d "release-$TAG" - -- GitLab