Finalized MSVC build in Github actions and removed MSVC build in Appveyor

pull/1073/head
f4exb 2021-10-16 11:37:54 +02:00
rodzic 4ecdee76de
commit dad546eb2e
2 zmienionych plików z 40 dodań i 83 usunięć

Wyświetl plik

@ -10,16 +10,16 @@ matrix:
environment:
matrix:
- TARGET: vs2019gui
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2019'
configuration: Release
CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \
-DARCH_OPT=SSE4_2 \
-DDEBUG_OUTPUT=ON \
-DENABLE_MIRISDR=OFF \
-DBUILD_SERVER=OFF \
-DCMAKE_PREFIX_PATH=C:\\Qt\\5.15.2\\msvc2019_64;C:\\Libraries\\boost_1_73_0"
CMAKE_GENERATOR: Ninja
# - TARGET: vs2019gui
# APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2019'
# configuration: Release
# CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \
# -DARCH_OPT=SSE4_2 \
# -DDEBUG_OUTPUT=ON \
# -DENABLE_MIRISDR=OFF \
# -DBUILD_SERVER=OFF \
# -DCMAKE_PREFIX_PATH=C:\\Qt\\5.15.2\\msvc2019_64;C:\\Libraries\\boost_1_73_0"
# CMAKE_GENERATOR: Ninja
- TARGET: ubuntu2004prod
APPVEYOR_BUILD_WORKER_CLOUD: nasrock Docker
APPVEYOR_BUILD_WORKER_IMAGE: Linux
@ -36,36 +36,36 @@ environment:
APPVEYOR_CONSOLE_DISABLE_PTY: true
for:
- matrix:
only:
- TARGET: 'vs2019gui'
cache:
- C:\ProgramData\chocolatey\bin
- C:\ProgramData\chocolatey\lib
build_script:
- call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
# Install GNU patch as applying patches with git fails in BladeRF tree
- choco install patch
- git submodule update --init --recursive
- mkdir build && cd build
- cmake .. -G "%CMAKE_GENERATOR%" %CMAKE_CUSTOM_OPTIONS%
- cmake --build . --config Release --target package
artifacts: # push installer executable
path: build\*.exe
name: installer
deploy:
release: sdrangel-v$(appveyor_build_version)
description: 'SDRangel Windows'
provider: GitHub
auth_token:
secure: kyU5TaXRoily6q/QLRLqal2xCFGWEdnb8AJIu7FknsUQyj1wjRGmqC2My+Wfszod
artifact: installer, portable
draft: false
prerelease: false
tag: $(APPVEYOR_REPO_TAG_NAME) # will not work until tag is pushed
on:
APPVEYOR_REPO_TAG: true # deploy on tag push only
branch: master # release from master branch only
# - matrix:
# only:
# - TARGET: 'vs2019gui'
# cache:
# - C:\ProgramData\chocolatey\bin
# - C:\ProgramData\chocolatey\lib
# build_script:
# - call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
# # Install GNU patch as applying patches with git fails in BladeRF tree
# - choco install patch
# - git submodule update --init --recursive
# - mkdir build && cd build
# - cmake .. -G "%CMAKE_GENERATOR%" %CMAKE_CUSTOM_OPTIONS%
# - cmake --build . --config Release --target package
# artifacts: # push installer executable
# path: build\*.exe
# name: installer
# deploy:
# release: sdrangel-v$(appveyor_build_version)
# description: 'SDRangel Windows'
# provider: GitHub
# auth_token:
# secure: kyU5TaXRoily6q/QLRLqal2xCFGWEdnb8AJIu7FknsUQyj1wjRGmqC2My+Wfszod
# artifact: installer, portable
# draft: false
# prerelease: false
# tag: $(APPVEYOR_REPO_TAG_NAME) # will not work until tag is pushed
# on:
# APPVEYOR_REPO_TAG: true # deploy on tag push only
# branch: master # release from master branch only
- matrix:
only:
- TARGET: ubuntu2004prod

Wyświetl plik

@ -5,49 +5,6 @@ name: SDRangel CI/CD
on: [push]
jobs:
test:
if: false
name: ${{ matrix.config.name }}-Test
runs-on: ${{ matrix.config.os }}
strategy:
fail-fast: false
matrix:
config:
- {
name: "Windows-x64",
WIN_ARCH: "x64",
os: windows-latest,
QT_INST_DIR: "C:/",
QTDIR: "C:/Qt/5.15.2/msvc2019_64",
QT_ARCH: win64_msvc2019_64,
boost_dl: "${{ github.workspace }}\\downloads\\boost",
lib_dir: "C:\\Libraries",
build_type: "Release",
archiver: "7z a",
generators: Ninja
}
steps:
- uses: actions/checkout@v2
with:
submodules: true
fetch-depth: 0
- name: Print env
run: |
echo github.event.action: ${{ github.event.action }}
echo github.event_name: ${{ github.event_name }}
echo github.ref: ${{ github.ref }}
echo github.workspace: ${{ github.workspace }}
- name: Get version
id: get_version
run: echo "::set-output name=version::$(git describe --tags | cut -c2-)"
- name: Create dummy artifact
run: echo "test" > ${{ github.workspace }}/test-${{ steps.get_version.outputs.version }}.txt
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: test-${{ steps.get_version.outputs.version }}.txt
path: ${{ github.workspace }}/test-${{ steps.get_version.outputs.version }}.txt
build:
name: ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }}