diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-09-29 16:49:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 16:49:49 -0700 |
| commit | 397d3d7188cdcd4903b0bdb33b260dde993c1424 (patch) | |
| tree | 5ba335e9144ca6f6652acd19678a44daeb603077 /scripts/azure-pipelines/osx/configuration/Vagrantfile | |
| parent | b7c476bade673002cac838043b29c40bb46e1b85 (diff) | |
| download | vcpkg-397d3d7188cdcd4903b0bdb33b260dde993c1424.tar.gz vcpkg-397d3d7188cdcd4903b0bdb33b260dde993c1424.zip | |
[vcpkg osx ci] update 2020-09-28 (#13799)
* [vcpkg osx ci] update to newer bits
these ones should actually work!
* update vagrantfile
* correct scripts, reformat, add docs
* Finish Get-InternalBaseBox, move archives
In order to avoid people maliciously deleting the boxes,
the archives share and file share are in different users now.
* baseline libqcow to be fixed later
* actually check for the mount point
* fix Install-Prerequisites again
* add +x to Get-InternalBaseBox.ps1
additionally, fix some errors
Diffstat (limited to 'scripts/azure-pipelines/osx/configuration/Vagrantfile')
| -rw-r--r-- | scripts/azure-pipelines/osx/configuration/Vagrantfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile b/scripts/azure-pipelines/osx/configuration/Vagrantfile index 91a59860c..d13a5f652 100644 --- a/scripts/azure-pipelines/osx/configuration/Vagrantfile +++ b/scripts/azure-pipelines/osx/configuration/Vagrantfile @@ -32,7 +32,9 @@ devops_url = configuration['devops_url'] agent_pool = configuration['agent_pool'] pat = configuration['pat'] archives = configuration['archives'] -archives_url = "//#{archives['username']}:#{url_encode(archives['access_key'])}@#{archives['urn']}/#{archives['share']}" +archives_username = archives['username'] +archives_urn = archives['urn'] +archives_path = archives['path'] Vagrant.configure('2') do |config| # give them extra time to boot up @@ -102,7 +104,7 @@ Vagrant.configure('2') do |config| config.vm.provision "shell", run: 'once', name: 'Mount archives directory', - inline: "mount_smbfs -d 777 -f 777 #{archives_url} ~/Data/archives", + inline: "sshfs #{archives_username}@#{archives_urn}:#{archives_path} ~/Data/archives", privileged: false config.vm.provision 'shell', |