From 603c94f39e21c0151cc9e0d819a84237ddac1f08 Mon Sep 17 00:00:00 2001
From: holgern <holgernahrstaedt@gmx.de>
Date: Tue, 7 Apr 2020 22:28:16 +0200
Subject: [PATCH] Fix ci and installer
---
appveyor.yml | 12 ++++++------
pyinstaller/beempy-onedir.spec | 2 +-
pyinstaller/beempy-onefile.spec | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index ef0cc05e..04223dd4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -69,14 +69,14 @@ after_test:
- cmd: pyinstaller pyinstaller\beempy-onefile.spec
# package artifacts
-- cmd: copy /Y C:\OpenSSL-v111-Win64\bin\libcrypto-1_1-x64.dll dist\beempy
-- cmd: copy /Y C:\OpenSSL-v111-Win64\bin\libssl-1_1-x64.dll dist\beempy
-- cmd: copy /Y C:\OpenSSL-Win64\bin\ssleay32.dll dist\beempy
-- cmd: copy /Y C:\OpenSSL-Win64\bin\libeay32.dll dist\beempy
+- cmd: copy /Y C:\OpenSSL-v111-Win64\bin\libcrypto-1_1-x64.dll pyinstaller\dist\beempy
+- cmd: copy /Y C:\OpenSSL-v111-Win64\bin\libssl-1_1-x64.dll pyinstaller\dist\beempy
+- cmd: copy /Y C:\OpenSSL-Win64\bin\ssleay32.dll pyinstaller\dist\beempy
+- cmd: copy /Y C:\OpenSSL-Win64\bin\libeay32.dll pyinstaller\dist\beempy
# - cmd: 7z a -衫x9 beempy.zip %APPVEYOR_BUILD_FOLDER%\dist\beempy
#- ps: 7z a -m0=LZMA2 -mx9 $env:BUILD .\dist\beempy
-- ps: 7z a $env:BUILD .\dist\beempy
-- ps: 7z a $env:BUILD2 .\dist\beempy.exe
+- ps: 7z a $env:BUILD .\pyinstaller\dist\beempy
+- ps: 7z a $env:BUILD2 .\pyinstaller\dist\beempy.exe
- ps: | # generate sha256 hashes
(get-filehash $env:BUILD -algorithm SHA256).Hash | out-file ("{0}.sha256" -f $env:BUILD) -encoding ascii
diff --git a/pyinstaller/beempy-onedir.spec b/pyinstaller/beempy-onedir.spec
index ae390de1..31cbd154 100644
--- a/pyinstaller/beempy-onedir.spec
+++ b/pyinstaller/beempy-onedir.spec
@@ -21,7 +21,7 @@ analysis_data = [
(websocket_cacert_file_path, join('.', basename(websocket_lib_path)))
]
-a = Analysis(['beem/cli.py'],
+a = Analysis(['../beem/cli.py'],
pathex=['beem'],
binaries=binaries,
datas=analysis_data,
diff --git a/pyinstaller/beempy-onefile.spec b/pyinstaller/beempy-onefile.spec
index 66279892..1143890c 100644
--- a/pyinstaller/beempy-onefile.spec
+++ b/pyinstaller/beempy-onefile.spec
@@ -22,7 +22,7 @@ analysis_data = [
]
-a = Analysis(['beem/cli.py'],
+a = Analysis(['../beem/cli.py'],
pathex=['beem'],
binaries=binaries,
datas=analysis_data,
--
GitLab