diff --git a/src/project-apis.txt b/src/project-apis.txt index a8fb3c12..397d4e83 100644 --- a/src/project-apis.txt +++ b/src/project-apis.txt @@ -4,6 +4,7 @@ appsactivity.googleapis.com calendar-json.googleapis.com chat.googleapis.com classroom.googleapis.com +cloudidentity.googleapis.com contacts.googleapis.com drive.googleapis.com iap.googleapis.com diff --git a/src/travis/.linux-x86_64-before-install.sh.swp b/src/travis/.linux-x86_64-before-install.sh.swp new file mode 100644 index 00000000..7aa67d0d Binary files /dev/null and b/src/travis/.linux-x86_64-before-install.sh.swp differ diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh index a213786f..620accbb 100755 --- a/src/travis/windows-x86-before-install.sh +++ b/src/travis/windows-x86-before-install.sh @@ -2,6 +2,7 @@ echo "Installing Net-Framework-Core..." export mypath=$(pwd) cd ~ until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done +cup -y chocolatey cinst -y --forcex86 python3 until cinst -y wixtoolset; do echo "trying again..."; done export PATH=$PATH:/c/Python38/scripts diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index 9d69207d..7a698108 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -9,6 +9,7 @@ cd ~ #fi #echo "Installing $exefile..." #powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl" +cup -y chocolatey cinst -y python3 until cinst -y wixtoolset; do echo "trying again..."; done #until cp -v /c/ssl/libcrypto-1_1-x64.dll /c/Python37/DLLs/libcrypto-1_1.dll; do echo "trying again..."; done