Merge pull request #106 from charlieok/upgrade_vagrant_vm_to_debian_10

Upgrade vagrant vm to debian 10
This commit is contained in:
Charlie O'Keefe 2021-04-12 16:30:33 -06:00 committed by GitHub
commit 3c7bcb5365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 37 deletions

View File

@ -397,7 +397,7 @@ Check that you can run `ansible` from the command line:
```
zcash-gitian % ansible --version
ansible 2.10.6
ansible 2.10.7
[...]
zcash-gitian %
```

4
Vagrantfile vendored
View File

@ -10,8 +10,8 @@ Vagrant.configure(2) do |config|
config.ssh.forward_agent = true
config.disksize.size = '24GB'
config.vm.define 'zcash-build', autostart: false do |gitian|
gitian.vm.box = "debian/stretch64"
gitian.vm.box_version = "9.12.0"
gitian.vm.box = "debian/buster64"
gitian.vm.box_version = "10.4.0"
gitian.vm.network "forwarded_port", guest: 22, host: 2200, auto_correct: true
gitian.vm.provision "ansible" do |ansible|
ansible.playbook = "gitian.yml"

View File

@ -2,13 +2,13 @@
This document assumes you are starting from a fresh install of macOS.
Most recently tested 2021-02-22 with the following macOS release:
Most recently tested 2021-04-09 with the following macOS release:
```
% sw_vers
ProductName: macOS
ProductVersion: 11.2
BuildVersion: 20D64
ProductVersion: 11.2.3
BuildVersion: 20D91
```
@ -18,7 +18,7 @@ BuildVersion: 20D64
macOS includes git, so you should already have that. It may prompt you to set up developer tools if
you're using it for the first time.
Most recently tested 2021-02-22 with the following git release:
Most recently tested 2021-04-09 with the following git release:
```
% git --version
@ -50,17 +50,11 @@ Most recently tested 2021-02-22 with the following Homebrew release:
```
% brew --version
Homebrew 3.0.2
Homebrew/homebrew-core (git revision 372d8a; last commit 2021-02-22)
Homebrew/homebrew-cask (git revision 3aab2; last commit 2021-02-22)
Homebrew 3.0.11
Homebrew/homebrew-core (git revision 5aa04149e9; last commit 2021-04-09)
Homebrew/homebrew-cask (git revision 77095bcb6b; last commit 2021-04-09)
```
That last line about "homebrew-cask" refers to a subcommand 'cask' that can manage the types of
installs mac users ordinarily do manually - the "drag to the applications folder" type and the "run
an installer" type.
We'll use both "brew" and "brew cask" install methods in the steps below.
## Install Virtualbox
@ -69,10 +63,10 @@ This one may fail on the first attempt with a prompt to allow software signed by
that, the second attempt should succeed.
```
$ brew install --cask virtualbox
$ brew install virtualbox
```
Most recently tested 2021-02-22 with the following Virtualbox release:
Most recently tested 2021-04-09 with the following Virtualbox release:
```
% VBoxManage --version
@ -84,14 +78,14 @@ Most recently tested 2021-02-22 with the following Virtualbox release:
## Install Vagrant
```
$ brew install --cask vagrant
$ brew install vagrant
```
Most recently tested 2021-02-22 with the following Vagrant release:
Most recently tested 2021-04-09 with the following Vagrant release:
```
% vagrant --version
Vagrant 2.2.14
Vagrant 2.2.15
```
@ -102,12 +96,12 @@ Vagrant 2.2.14
$ brew install gnupg
```
Most recently tested 2021-02-22 with the following GnuPG release:
Most recently tested 2021-04-09 with the following GnuPG release:
```
% gpg --version
gpg (GnuPG) 2.2.27
libgcrypt 1.8.7
libgcrypt 1.9.2
[...]
```
@ -153,9 +147,9 @@ eval "$(direnv hook bash)"
direnv also supports several other shells -- zsh, fish, tcsh, and elvish as of this writing. Its
website includes instructions for enabling each of the shells it supports.
Most recently tested 2021-02-22 with the following direnv release:
Most recently tested 2021-04-09 with the following direnv release:
```
% direnv --version
2.27.0
2.28.0
```

View File

@ -1,11 +1,11 @@
# Primary Dependencies
# (Packages we actually decided to include)
ansible==3.0.0
ansible==3.2.0
# Secondary Dependencies
# (pulled in by one or more of the above dependencies)
ansible-base==2.10.6
ansible-base==2.10.7
cffi==1.14.5
cryptography==3.4.6
cryptography==3.4.7
Jinja2==2.11.3
MarkupSafe==1.1.1
packaging==20.9

View File

@ -30,13 +30,6 @@
update_cache: yes
cache_valid_time: 3600
- name: Perform aptitude safe-upgrade.
apt:
upgrade: safe
update_cache: yes
cache_valid_time: 3600
tags: apt
- name: Remove unneeded packages.
apt:
autoremove: yes

View File

@ -80,7 +80,7 @@ with open(input_file_path) as fp:
sequence = data[args.key_to_explode]
for item in sequence:
print item
print(item)
item_dir_path = os.path.join(output_dir_path, item)
if not os.path.exists(item_dir_path):

View File

@ -32,7 +32,7 @@
- name: Install ruamel.yaml
pip:
name: "ruamel.yaml"
name: "ruamel.yaml==0.16.11"
- name: Set up the Gitian build user with sudo.
user: