Compare commits
No commits in common. "4045938bb7452156f6a5a69b87c86b04def0dc5a" and "8e2ff6c1168921b9f4793a6fc28da01e01c21990" have entirely different histories.
4045938bb7
...
8e2ff6c116
23
.github/workflows/build.yml
vendored
23
.github/workflows/build.yml
vendored
@ -7,34 +7,29 @@ jobs:
|
||||
build-msvc:
|
||||
name: Build Windows
|
||||
runs-on: windows-latest
|
||||
env:
|
||||
BUILD_TOOLS_PATH: C:\apps\build-tools\
|
||||
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:
|
||||
submodules: true
|
||||
|
||||
- name: Install Build tools
|
||||
shell: cmake -P {0}
|
||||
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: Install deps
|
||||
run: choco install ninja conan -y
|
||||
|
||||
- name: Enable Developer Command Prompt
|
||||
uses: ilammy/msvc-dev-cmd@v1.10.0
|
||||
|
||||
- name: Cache conan packages
|
||||
uses: actions/cache@v3
|
||||
uses: actions/cache@v2.1.7
|
||||
with:
|
||||
key: win-conan-${{ hashFiles('**/conanfile.txt') }}
|
||||
path: ~/.conan/
|
||||
|
||||
- name: Cache Qt
|
||||
id: cache-qt
|
||||
uses: actions/cache@v3
|
||||
uses: actions/cache@v2.1.7
|
||||
with:
|
||||
path: "${{ github.workspace }}/qt/"
|
||||
key: ${{ runner.os }}-QtCache
|
||||
@ -54,7 +49,7 @@ jobs:
|
||||
mkdir build
|
||||
cd build
|
||||
conan install .. --build=missing
|
||||
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=redist ..
|
||||
cmake -GNinja -DCMAKE_INSTALL_PREFIX=redist ..
|
||||
ninja
|
||||
shell: cmd
|
||||
|
||||
@ -74,7 +69,7 @@ jobs:
|
||||
name: Build Linux
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v2.4.0
|
||||
with:
|
||||
submodules: true
|
||||
|
||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -45,4 +45,3 @@ CMakeLists.txt.user*
|
||||
*.qm
|
||||
/build*
|
||||
.idea/
|
||||
test-pr
|
Loading…
x
Reference in New Issue
Block a user