From 2c727007accd6ba975e1f954db150eabe18fa615 Mon Sep 17 00:00:00 2001 From: "Jules Lasne (jlasne)" Date: Fri, 16 Oct 2020 08:34:25 +0200 Subject: [PATCH] Deleted make-merge.sh (outdate unused script) (#1450) Closes #1065 --- make-merge.sh | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100755 make-merge.sh diff --git a/make-merge.sh b/make-merge.sh deleted file mode 100755 index 11ace5a2..00000000 --- a/make-merge.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/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)