Fix GitHub Actions/Azure Windows Workflow/Pipeline

Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
Paulchen-Panther 2020-07-12 15:50:30 +02:00
parent 4d56a8974c
commit 9c5e5cac24
3 changed files with 47 additions and 11 deletions

View File

@ -71,22 +71,40 @@ jobs:
timeoutInMinutes: 120 timeoutInMinutes: 120
pool: pool:
vmImage: 'windows-latest' vmImage: 'windows-latest'
variables:
VCINSTALLDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
steps: steps:
- checkout: self # represents the repo where the initial Pipelines YAML file was found - checkout: self # represents the repo where the initial Pipelines YAML file was found
submodules: recursive # set to 'recursive' to get submodules of submodules submodules: recursive # set to 'recursive' to get submodules of submodules
# install qt 5.15 via aqtinstall
- script: |
cd $(Build.SourcesDirectory)
python -m pip install aqtinstall
python -m aqt install -O c:\Qt 5.15.0 windows desktop win64_msvc2019_64
displayName: 'Install Qt'
# use Python 3.x from the tool cache
- task: UsePythonVersion@0 - task: UsePythonVersion@0
inputs: inputs:
versionSpec: '3.x' versionSpec: '3.x'
addToPath: true addToPath: true
architecture: 'x64' architecture: 'x64'
displayName: 'Install Python'
# install nsis via chocolatey
- powershell: choco install --no-progress nsis -y
displayName: 'Install NSIS'
# install openssl via chocolatey
- powershell: choco install --no-progress openssl -y
displayName: 'Install OpenSSL'
# register x64 architecture environment
- script: | - script: |
cd $(Build.SourcesDirectory) call "%VCINSTALLDIR%\Auxiliary\Build\vcvars64.bat"
python -m pip install aqtinstall displayName: 'Set up x64 build architecture environment'
python -m aqt install -O c:\Qt 5.15.0 windows desktop win64_msvc2019_64
displayName: 'Install Qt 5.15.0'
# build process # build process
- bash: ./.ci/ci_build.sh - bash: ./.ci/ci_build.sh

View File

@ -121,6 +121,8 @@ jobs:
windows: windows:
name: Windows name: Windows
runs-on: windows-latest runs-on: windows-latest
env:
VCINSTALLDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v1
@ -147,18 +149,18 @@ jobs:
python-version: '3.x' python-version: '3.x'
- name: Install NSIS - name: Install NSIS
run: | run: choco install --no-progress nsis -y
Invoke-WebRequest https://netcologne.dl.sourceforge.net/project/nsis/NSIS%203/3.05/nsis-3.05-setup.exe -OutFile nsis-setup.exe
.\nsis-setup.exe /S - name: Install OpenSSL
run: choco install --no-progress openssl -y
- name: Set up x64 build architecture environment - name: Set up x64 build architecture environment
shell: cmd shell: cmd
run: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" run: call "${{env.VCINSTALLDIR}}\Auxiliary\Build\vcvars64.bat"
# Build packages # Build packages
- name: Build packages - name: Build packages
env: env:
VCINSTALLDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
PLATFORM: windows PLATFORM: windows
shell: bash shell: bash
run: ./.ci/ci_build.sh run: ./.ci/ci_build.sh

View File

@ -92,6 +92,8 @@ jobs:
windows: windows:
name: Windows name: Windows
runs-on: windows-latest runs-on: windows-latest
env:
VCINSTALLDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v1
@ -110,9 +112,15 @@ jobs:
with: with:
python-version: '3.x' python-version: '3.x'
- name: Install NSIS
run: choco install --no-progress nsis -y
- name: Install OpenSSL
run: choco install --no-progress openssl -y
- name: Set up x64 build architecture environment - name: Set up x64 build architecture environment
shell: cmd shell: cmd
run: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" run: call "${{env.VCINSTALLDIR}}\Auxiliary\Build\vcvars64.bat"
# Build packages # Build packages
- name: Build packages - name: Build packages
@ -121,6 +129,13 @@ jobs:
shell: bash shell: bash
run: ./.ci/ci_build.sh run: ./.ci/ci_build.sh
# upload artifacts (only on tagged commit)
- name: Upload artifacts
if: startsWith(github.event.ref, 'refs/tags')
uses: actions/upload-artifact@v2
with:
path: build/Hyperion-*
###################### ######################
#### Documentation ### #### Documentation ###
###################### ######################
@ -165,7 +180,7 @@ jobs:
publish: publish:
name: Publish Releases name: Publish Releases
if: startsWith(github.event.ref, 'refs/tags') if: startsWith(github.event.ref, 'refs/tags')
needs: [Linux, macOS, Docs] needs: [Linux, macOS, windows, Docs]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
@ -200,6 +215,7 @@ jobs:
prerelease: ${{ env.preRelease }} prerelease: ${{ env.preRelease }}
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Dispatch event to build new HyperBian image # Dispatch event to build new HyperBian image
- name: Dispatch HyperBian build - name: Dispatch HyperBian build
uses: peter-evans/repository-dispatch@v1 uses: peter-evans/repository-dispatch@v1