From 57df46173d804efa77a96b9a6164a3b8ce1cdaff Mon Sep 17 00:00:00 2001
From: Christophe Bliard <christophe.bliard@trux.info>
Date: Wed, 19 Aug 2020 17:40:57 +0200
Subject: [PATCH] Improve release process

---
 CONTRIBUTING.md | 2 +-
 Makefile        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fa83469094..34425f8aca 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -66,6 +66,6 @@ help us to correct style violations reported here:
 * Now release it:
 
 ```
-git commit -m "Release X.Y.Z"
+git commit -am "Release X.Y.Z"
 make release
 ```
diff --git a/Makefile b/Makefile
index 3c99f32748..62f16b13a1 100644
--- a/Makefile
+++ b/Makefile
@@ -53,9 +53,10 @@ release:
 		--volume "${shell pwd}/../secrets/.ssh":/home/cukebot/.ssh \
 		--volume "${shell pwd}/../secrets/.gem":/home/cukebot/.gem \
 		--volume "${HOME}/.gitconfig":/home/cukebot/.gitconfig \
+		--env CUCUMBER_USE_RELEASED_GEMS=1 \
 		--env-file ../secrets/secrets.list \
 		--user 1000 \
 		--rm \
 		-it cucumber/cucumber-build:latest \
-		bundle && bundle exec rake && bundle exec rake release
+		bash -c "rm Gemfile.lock && bundle && bundle exec rake && bundle exec rake release"
 .PHONY: release