Compare commits

..

No commits in common. "4045938bb7452156f6a5a69b87c86b04def0dc5a" and "8e2ff6c1168921b9f4793a6fc28da01e01c21990" have entirely different histories.

2 changed files with 10 additions and 16 deletions

View File

@ -7,34 +7,29 @@ jobs:
build-msvc: build-msvc:
name: Build Windows name: Build Windows
runs-on: windows-latest runs-on: windows-latest
env:
BUILD_TOOLS_PATH: C:\apps\build-tools\
steps: steps:
- run: echo $env:BUILD_TOOLS_PATH | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Add Conan to path
run: echo "C:\Program Files\Conan\conan\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- uses: actions/checkout@v3 - uses: actions/checkout@v2.4.0
with: with:
submodules: true submodules: true
- name: Install Build tools - name: Install deps
shell: cmake -P {0} run: choco install ninja conan -y
run: |
file(MAKE_DIRECTORY $ENV{BUILD_TOOLS_PATH})
file(DOWNLOAD https://cdn.anotherfoxguy.com/build-tools.zip "$ENV{TMP}/build-tools.zip" SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "$ENV{TMP}/build-tools.zip" WORKING_DIRECTORY "$ENV{BUILD_TOOLS_PATH}")
- name: Enable Developer Command Prompt - name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1.10.0 uses: ilammy/msvc-dev-cmd@v1.10.0
- name: Cache conan packages - name: Cache conan packages
uses: actions/cache@v3 uses: actions/cache@v2.1.7
with: with:
key: win-conan-${{ hashFiles('**/conanfile.txt') }} key: win-conan-${{ hashFiles('**/conanfile.txt') }}
path: ~/.conan/ path: ~/.conan/
- name: Cache Qt - name: Cache Qt
id: cache-qt id: cache-qt
uses: actions/cache@v3 uses: actions/cache@v2.1.7
with: with:
path: "${{ github.workspace }}/qt/" path: "${{ github.workspace }}/qt/"
key: ${{ runner.os }}-QtCache key: ${{ runner.os }}-QtCache
@ -54,7 +49,7 @@ jobs:
mkdir build mkdir build
cd build cd build
conan install .. --build=missing conan install .. --build=missing
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=redist .. cmake -GNinja -DCMAKE_INSTALL_PREFIX=redist ..
ninja ninja
shell: cmd shell: cmd
@ -74,7 +69,7 @@ jobs:
name: Build Linux name: Build Linux
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v2.4.0
with: with:
submodules: true submodules: true

3
.gitignore vendored
View File

@ -44,5 +44,4 @@ CMakeLists.txt.user*
*.qm *.qm
/build* /build*
.idea/ .idea/
test-pr