From: Atharva Lele <itsatharva@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 27/27] scripts/autobuild-run: support changing repo
Date: Thu, 4 Jul 2019 00:01:59 +0530 [thread overview]
Message-ID: <20190703183159.3415-27-itsatharva@gmail.com> (raw)
In-Reply-To: <20190703183159.3415-1-itsatharva@gmail.com>
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
The current logic in prepare_build() assumes that the "origin" repo
never changes. However, if one regularly changes his autobuild-run
configuration, switching being repository, this is not
true. Currently, it requires manually wiping out the Buildroot clone
in every autobuild instance when changing the repository to pull from.
So instead, use:
git fetch <repo> <branch>
git checkout FETCH_HEAD
which will easily allow switching from one repo to the other.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[Atharva: Adapted Thomas' patches to work with Builder class]
Signed-off-by: Atharva Lele <itsatharva@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Changes v1 -> v2:
- Incorporate Thomas' patch into Builder class series
---
scripts/autobuild-run | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/autobuild-run b/scripts/autobuild-run
index 3823d63..2062cff 100755
--- a/scripts/autobuild-run
+++ b/scripts/autobuild-run
@@ -361,12 +361,12 @@ class Builder:
# Update the Buildroot sources.
abssrcdir = os.path.abspath(self.srcdir)
- ret = subprocess.call(["git", "fetch", "origin"], cwd=abssrcdir, stdout=self.log, stderr=self.log)
+ ret = subprocess.call(["git", "fetch", self.repo, branch], cwd=abssrcdir, stdout=self.log, stderr=self.log)
if ret != 0:
log_write(self.log, "ERROR: could not fetch Buildroot sources")
return -1
- ret = subprocess.call(["git", "checkout", "--detach", "origin/%s" % branch], cwd=abssrcdir, stdout=self.log, stderr=self.log)
+ ret = subprocess.call(["git", "checkout", "FETCH_HEAD"], cwd=abssrcdir, stdout=self.log, stderr=self.log)
if ret != 0:
log_write(self.log, "ERROR: could not check out Buildroot sources")
return -1
--
2.22.0
prev parent reply other threads:[~2019-07-03 18:31 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-03 18:31 [Buildroot] [PATCH v2 01/27] autobuild-run: introduce Builder class Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 02/27] autobuild-run: move instance variable from kwargs to " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 03/27] autobuild-run: move njobs " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 04/27] autobuild-run: move sysinfo " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 05/27] autobuild-run: move http variables " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 06/27] autobuild-run: move submitter " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 07/27] autobuild-run: move make_opts " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 08/27] autobuild-run: move niceness " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 09/27] autobuild-run: move toolchains_csv " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 10/27] autobuild-run: move repo " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 11/27] autobuild-run: move upload variable " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 12/27] autobuild-run: move buildpid " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 13/27] autobuild-run: move debug " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 14/27] autobuild-run: define instance directory as a part of " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 15/27] autobuild-run: move log variable to " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 16/27] autobuild-run: remove kwargs argument from function calls and definitions Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 17/27] autobuild-run: define source directory as part of Builder class Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 18/27] autobuild-run: define download " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 19/27] autobuild-run: define output " Atharva Lele
2019-07-04 17:36 ` Arnout Vandecappelle
2019-07-03 18:31 ` [Buildroot] [PATCH v2 20/27] autobuild-run: define results " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 21/27] autobuild-run: move check_version() to " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 22/27] autobuild-run: move get_branch() " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 23/27] scripts/autobuild-run: make the HTTP URL really configurable Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 24/27] autobuild-run: create reason file on build failures Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 25/27] autobuild-run: account for reproducibility failures when creating the reason file Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 26/27] web/import.inc.php: support reading failure reason from " Atharva Lele
2019-07-03 18:31 ` Atharva Lele [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190703183159.3415-27-itsatharva@gmail.com \
--to=itsatharva@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox