From 89783498e671ab4580d26207ed9e63745c8a8967 Mon Sep 17 00:00:00 2001 From: Wiktor Mazur Date: Tue, 27 Aug 2019 18:13:14 +0200 Subject: [PATCH] + windows pipeline --- appveyor.yml | 42 ++++++++++++++++++++++++++++-------------- gui/requirements.txt | 2 ++ 2 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 gui/requirements.txt diff --git a/appveyor.yml b/appveyor.yml index 0be7382..3f7d379 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,17 +1,20 @@ +image: Visual Studio 2017 environment: RUST_TEST_THREADS: 1 matrix: - - TARGET: x86_64-pc-windows-msvc - RUST_CHANNEL: 1.27.1 - WPD_LIB_PATH: "C:/dl/wpdpack/WpdPack/Lib/x64/Packet.lib" - VCVARS: "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\vcvars64.bat" + - TARGET: x86_64-pc-windows-msvc + RUST_CHANNEL: beta + WPD_LIB_PATH: "C:/dl/wpdpack/WpdPack/Lib/x64/Packet.lib" + PYTHON: "C:\\Python36-x64" + PYTHON_ARCH: "64" + VCVARS: "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\vcvars64.bat" install: + - SET PATH=%PYTHON%;%path% - ps: mkdir C:/dl - curl -o "C:/dl/wpd.zip" "https://www.winpcap.org/install/bin/WpdPack_4_1_2.zip" - ps: Add-Type -AssemblyName system.io.compression.filesystem - ps: "[io.compression.zipfile]::ExtractToDirectory(\"C:/dl/wpd.zip\", \"C:/dl/wpdpack\")" - - ps: mkdir ${env:APPVEYOR_BUILD_FOLDER}/lib - - ps: cp ${env:WPD_LIB_PATH} ${env:APPVEYOR_BUILD_FOLDER}/lib + - ps: cp ${env:WPD_LIB_PATH} "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB\amd64" - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:RUST_CHANNEL}-${env:TARGET}.exe" - rust-%RUST_CHANNEL%-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust" - CALL "%VCVARS%" @@ -19,18 +22,29 @@ install: - choco install winpcap - rustc -V - cargo -V -build: true +test: false build_script: - - cargo build --release --verbose + - cargo build --release --verbose +after_build: +- ps: cd ${env:APPVEYOR_BUILD_FOLDER}/gui +- python -m venv env +- ps: .\env\Scripts\activate.ps1 +- pip install -r requirements.txt +- ps: cp ${env:APPVEYOR_BUILD_FOLDER}\target\release\meter.dll libmeter.pyd +- pyinstaller -F -i ..\assets\albion-stats-icon.ico meter.py +- ps: deactivate +- ps: mv dist\meter.exe ..\albion-online-stats.exe +- ps: ls +- ps: ls ..\ +artifacts: + path: albion-online-stats.exe + name: binary deploy: - release: myproduct-v$(appveyor_build_version) - description: 'Release description' provider: GitHub auth_token: - secure: $(GITHUB_TOKEN) # your encrypted token from GitHub - artifact: /.*\.nupkg/ # upload all NuGet packages to release assets + secure: cB8zvJaO/tS/Z3v4038LBCsRaO9LqrtRS0CV/eLfHnG5SefWKNSObALSvphoQxC4 + artifact: binary draft: false prerelease: false on: - branch: master # release from master branch only - # APPVEYOR_REPO_TAG: true # deploy on tag push only + APPVEYOR_REPO_TAG: true # deploy on tag push only diff --git a/gui/requirements.txt b/gui/requirements.txt new file mode 100644 index 0000000..029b693 --- /dev/null +++ b/gui/requirements.txt @@ -0,0 +1,2 @@ +pyside2~=5.13 +pyinstaller \ No newline at end of file