diff --git a/.travis.yml b/.travis.yml index 6320c124..1d8f8769 100644 --- a/.travis.yml +++ b/.travis.yml @@ -275,6 +275,9 @@ script: - if [ "$e2e" = true ]; then $gam whatis $newuser; fi - if [ "$e2e" = true ]; then $gam user $gam_user show tokens; fi - if [ "$e2e" = true ]; then $gam print exports matter "Travis matter $newbase" | $gam csv - gam download export id:~~matterId~~ id:~~id~~; fi +- if [ "$e2e" = true ]; then $gam delete hold "Travis hold $newbase" matter "Travis matter $newbase"; fi +- if [ "$e2e" = true ]; then $gam update matter "Travis matter $newbase" action close; fi +- if [ "$e2e" = true ]; then $gam update matter "Travis matter $newbase" action delete; fi - if [ "$e2e" = true ]; then $gam delete user $newuser; fi - if [ "$e2e" = true ]; then $gam print users query "travis.jid=$jid" | $gam csv - gam delete user ~primaryEmail; fi - if [ "$e2e" = true ]; then $gam print mobile; fi diff --git a/src/gapi/vault.py b/src/gapi/vault.py index 12d2a69c..f0e910d0 100644 --- a/src/gapi/vault.py +++ b/src/gapi/vault.py @@ -702,7 +702,6 @@ def printExports(): matterState = matter['state'] matterId = matter['matterId'] if matterState != 'OPEN': - print(f'ignoring matter {matterId} in state {matterState}') continue matterIds.append(matterId) else: @@ -746,7 +745,6 @@ def printHolds(): matterState = matter['state'] matterId = matter['matterId'] if matterState != 'OPEN': - print(f'ignoring matter {matterId} in state {matterState}') continue matterIds.append(matterId) else: diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index d690f8bf..5d8ac49d 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -13,8 +13,10 @@ export python_file=python-$BUILD_PYTHON_VERSION-amd64.exe wget --quiet https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file powershell ".\\${python_file} /quiet InstallAllUsers=1 TargetDir=c:\\python" until cinst -y wixtoolset; do echo "trying again..."; done -until cp -v /c/ssl/libcrypto-1_1-x64.dll /c/python/DLLs/libcrypto-1_1.dll; do echo "trying again..."; done -until cp -v /c/ssl/libssl-1_1-x64.dll /c/python/DLLs/libssl-1_1.dll; do echo "trying again..."; done +until cp -v /c/ssl/libcrypto-1_1-x64.dll /c/python/DLLs/; do echo "trying libcrypto copy again..."; done +cp -v /c/python/DLLs/libcrypto-1_1-x64.dll /c/python/DLLs/libcrypto-1_1.dll +until cp -v /c/ssl/libssl-1_1-x64.dll /c/python/DLLs/; do echo "trying libssl copy again..."; done +cp -v /c/python/DLLs/libssl-1_1-x64.dll /c/python/DLLs/libssl-1_1.dll export PATH=$PATH:/c/python/scripts cd $mypath export python=/c/python/python.exe