From f030600468f8fcefebc9f40eeaebb83b19305386 Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Sun, 23 Aug 2020 15:48:06 -0400 Subject: [PATCH] ci: Fix another typo --- .travis.yml | 2 +- deployment/windows/choco/choco_packager.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e5d6201..77adfea5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ before_deploy: strip "./target/i686-pc-windows-msvc/release/btm"; mv "./target/i686-pc-windows-msvc/release/btm" "btm.exe"; zip bottom_i686-pc-windows-msvc.zip "btm.exe"; - python "./deployment/windows/choco/choco_packager.py" "bottom_i686-pc-windows-msvc.zip" "bottom_x86_64-pc-windows-msvc.zip" $TRAVIS_TAG "./deployment/windows/choco/bottom.nuspec.template" "./deployment/windows/choco/chocolateyinstall.ps1.template" "./deployment/windows/choco/bottom.nuspec" "./deployment/windows/choco/tools/chocolateyinstall.ps1"; + python "./deployment/windows/choco/choco_packager.py" "bottom_i686-pc-windows-msvc.zip" "bottom_x86_64-pc-windows-msvc.zip" $TRAVIS_TAG "./deployment/windows/choco/bottom.nuspec.template" "./deployment/windows/choco/chocolateyinstall.ps1.template" "./deployment/windows/choco/bottom.nuspec" "./deployment/windows/choco/tools/chocolateyinstall.ps1" "./deployment/windows/choco/tools/"; zip choco.zip "./deployment/windows/choco/bottom.nuspec" "./deployment/windows/choco/tools/"; # Generating msi # See https://travis-ci.community/t/unable-to-install-wix-toolset/1071 for why we do nuget. diff --git a/deployment/windows/choco/choco_packager.py b/deployment/windows/choco/choco_packager.py index 445349a4..453a482e 100644 --- a/deployment/windows/choco/choco_packager.py +++ b/deployment/windows/choco/choco_packager.py @@ -22,7 +22,8 @@ print(" VERSION: %s" % version) print(" NUSPEC TEMPLATE: %s" % nuspec_template) print(" PS1 TEMPLATE: %s" % ps1_template) print(" GENERATED NUSPEC: %s" % generated_nuspec) -print(" GENERATED_PS1: %s" % generated_ps1) +print(" GENERATED PS1: %s" % generated_ps1) +print(" GENERATED PS1 DIR: %s" % generated_ps1_dir) with open(deployment_file_path_32, "rb") as deployment_file_32, open( deployment_file_path_64, "rb" @@ -43,7 +44,7 @@ with open(deployment_file_path_32, "rb") as deployment_file_32, open( with open(generated_nuspec, "w") as generated_file: generated_file.write(substitute) - os.makedirs("tools") + os.makedirs(generated_ps1_dir) with open(ps1_template, "r") as template_file: template = Template(template_file.read()) substitute = template.safe_substitute(version=version, hash_32=hash_32, hash_64=hash_64)