fix nsis build

This commit is contained in:
ymshenyu 2020-10-08 12:33:30 +08:00
parent fcb826fa0d
commit f0e1d6404d

View File

@ -1,6 +1,6 @@
name: Qv2ray Windows Installer
on:
on:
push:
release:
types: [prereleased]
@ -26,7 +26,7 @@ jobs:
qt_version: [5.15.0]
platform: [windows-latest]
arch: [x86, x64]
include:
include:
- platform: windows-latest
arch: x86
qtarch: win32_msvc2019
@ -34,12 +34,12 @@ jobs:
arch: x64
qtarch: win64_msvc2019_64
fail-fast: false
runs-on: ${{ matrix.platform }}
env:
_QV2RAY_BUILD_INFO_: "Qv2ray built from Github Action"
_QV2RAY_BUILD_EXTRA_INFO_: "qt${{ matrix.qt_version }}-${{ github.sha }}-ci.${{ matrix.platform }}"
steps:
- name: Get the version
id: get_version
@ -50,14 +50,14 @@ jobs:
- name: Install Python 3.7 version
uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: "3.7"
architecture: ${{ matrix.arch }}
- name: Restoring submodules
run: git submodule update --init
# =========================================================================================================
# =========================================================================================================
- name: Install MSVC compiler
uses: ilammy/msvc-dev-cmd@v1
with:
with:
# 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from Qv2ray-deps repo
toolset: 14.2
arch: ${{ matrix.arch }}
@ -72,32 +72,30 @@ jobs:
with:
version: ${{ matrix.qt_version }}
arch: ${{ matrix.qtarch }}
mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
mirror: "http://mirrors.ocf.berkeley.edu/qt/"
cached: ${{ steps.cache-qt.outputs.cache-hit }}
# =========================================================================================================
# =========================================================================================================
- name: Win-${{ matrix.arch }} - ${{ matrix.qt_version }} - Setup Ninja
if: matrix.platform == 'windows-latest'
uses: ashutoshvarma/setup-ninja@master
with:
# ninja version to download. Default: 1.10.0
version: 1.10.0
version: 1.10.0
- name: Win-${{ matrix.arch }} - ${{ matrix.qt_version }} - Build preparation - Download Dependencies
shell: bash
run: |
curl -o ./libs/Qv2ray-deps-grpc-${{ matrix.arch }}-windows.7z -L https://github.com/Qv2ray/Qv2ray-deps/releases/download/release/Qv2ray-deps-grpc-${{ matrix.arch }}-windows.7z
curl -o ./libs/Qv2ray-deps-curl-${{ matrix.arch }}-windows.7z -L https://github.com/Qv2ray/Qv2ray-deps/releases/download/release/Qv2ray-deps-curl-${{ matrix.arch }}-windows.7z
curl -o ./libs/grpc-${{ matrix.arch }}-windows.7z -L https://github.com/Qv2ray/Qv2ray-deps/releases/download/release/grpc-${{ matrix.arch }}-windows.7z
curl -o ./libs/curl-${{ matrix.arch }}-windows.7z -L https://github.com/Qv2ray/Qv2ray-deps/releases/download/release/curl-${{ matrix.arch }}-windows.7z
- name: Win-${{ matrix.arch }} - Build preparation - Extract Dependencies
uses: DuckSoft/extract-7z-action@v1.0
with:
pathSource: ./libs/Qv2ray-deps-grpc-${{ matrix.arch }}-windows.7z
pathTarget: ./libs
pathSource: ./libs/grpc-${{ matrix.arch }}-windows.7z
pathTarget: ./libs
- name: Win-${{ matrix.arch }} - Build preparation - Extract Dependencies
if: matrix.platform == 'windows-latest'
uses: DuckSoft/extract-7z-action@v1.0
with:
pathSource: ./libs/Qv2ray-deps-curl-${{ matrix.arch }}-windows.7z
pathTarget: ./libs
# ========================================================================================================= Generate MakeFile and Build
pathSource: ./libs/curl-${{ matrix.arch }}-windows.7z
pathTarget: ./libs
# ========================================================================================================= Generate MakeFile and Build
- name: Win-${{ matrix.arch }} - ${{ matrix.qt_version }} - Generate Dependencies and Build
shell: bash
env: