diff options
| author | mj-xmr <63722585+mj-xmr@users.noreply.github.com> | 2022-04-27 06:41:15 +0200 |
|---|---|---|
| committer | mj-xmr <mjxmr@protonmail.com> | 2022-06-06 15:52:36 +0200 |
| commit | 61d0712ed508127edf5216a215f81affaec37ea8 (patch) | |
| tree | 2b900f5f6743d46fd545dafae3c4f88c4845b855 | |
| parent | Merge pull request #8340 (diff) | |
| download | monero-61d0712ed508127edf5216a215f81affaec37ea8.tar.xz | |
Gitian: refresh the stale Monero dir via --setup switch
| -rw-r--r-- | contrib/gitian/README.md | 3 | ||||
| -rwxr-xr-x | contrib/gitian/gitian-build.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 9852b07ba..24cf26fa3 100644 --- a/contrib/gitian/README.md +++ b/contrib/gitian/README.md @@ -133,10 +133,11 @@ Common setup part: su - gitianuser GH_USER=YOUR_GITHUB_USER_NAME -VERSION=v0.17.2.0 +VERSION=v0.17.3.2 ``` Where `GH_USER` is your GitHub user name and `VERSION` is the version tag you want to build. +The `gitian-build.py`'s `--setup` switch will also refresh the environment of any stale files and submodules. Setup for LXC: diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py index 859c2c645..859f460a7 100755 --- a/contrib/gitian/gitian-build.py +++ b/contrib/gitian/gitian-build.py @@ -31,8 +31,10 @@ def setup(): subprocess.check_call(['git', 'checkout', 'c0f77ca018cb5332bfd595e0aff0468f77542c23']) os.makedirs('inputs', exist_ok=True) os.chdir('inputs') - if not os.path.isdir('monero'): - subprocess.check_call(['git', 'clone', args.url, 'monero']) + if os.path.isdir('monero'): + # Remove the potentially stale monero dir. Otherwise you might face submodule mismatches. + subprocess.check_call(['rm', 'monero', '-fR']) + subprocess.check_call(['git', 'clone', args.url, 'monero']) os.chdir('..') make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] if args.docker: |