From 3cd2a5efeeaa4d31fc6e7a6119ed46ad97978153 Mon Sep 17 00:00:00 2001 From: "Jules Lasne (jlasne)" Date: Mon, 8 Apr 2019 09:54:47 +0200 Subject: [PATCH] Add auto make merge (#660) --- make-merge.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 make-merge.sh diff --git a/make-merge.sh b/make-merge.sh new file mode 100755 index 00000000..11ace5a2 --- /dev/null +++ b/make-merge.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +rm -rf /tmp/cpython +git clone --depth 1 --branch 3.7 --single-branch https://github.com/python/cpython /tmp/cpython + +CPYTHON_LATEST_SHA=$(git -C /tmp/cpython rev-parse --short HEAD) + +git checkout -b make-merge-$CPYTHON_LATEST_SHA + +sed -i "s/COMMIT=[a-z0-9]*/COMMIT=$CPYTHON_LATEST_SHA/" .travis.yml + +make merge + +pip install -U pyhub-pr + +git add -A + +git commit -m "merge pot files." + +git push --set-upstream origin make-merge-$CPYTHON_LATEST_SHA + +pyhub_pr --organisation python --repo python-docs-fr --token $GITHUB_TOKEN --title "Merge from upstream doc" --body "This PR was created from the command line with pyhub-pr." --head $TOKEN_OWNER_USERNAME:make-merge-$(git rev-parse --short HEAD)