summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx22 <glx@openttd.org>2021-02-20 22:40:20 +0100
committerLoïc Guilloux <glx22@users.noreply.github.com>2021-02-24 17:54:24 +0100
commit30ae0190952d53f8e261e04b5b4e09efb1fdfd22 (patch)
tree7ee1010a9f1bca0a19cdd6eb8816b09e3593958a
parent8476f1243264f8c018d972e0b1b1fdb5b4cc5964 (diff)
downloadopenttd-30ae0190952d53f8e261e04b5b4e09efb1fdfd22.tar.xz
Change: [Actions] stop using 'run-cmake' action for CI
-rw-r--r--.github/workflows/ci-build.yml27
1 files changed, 21 insertions, 6 deletions
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 7996fd9be..ebdb06729 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -264,13 +264,28 @@ jobs:
- name: Install MSVC problem matcher
uses: ammaraskar/msvc-problem-matcher@master
- - name: Build
- uses: lukka/run-cmake@v3
+ - name: Configure developer command prompt for ${{ matrix.arch }}
+ uses: ilammy/msvc-dev-cmd@v1
with:
- cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
- useVcpkgToolchainFile: true
- buildDirectory: '${{ github.workspace }}/build'
- cmakeAppendedArgs: ' -GNinja'
+ arch: ${{ matrix.arch }}
+
+ - name: Build
+ shell: bash
+ run: |
+ mkdir build
+ cd build
+
+ echo "::group::CMake"
+ cmake .. \
+ -GNinja \
+ -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
+ -DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" \
+ # EOF
+ echo "::endgroup::"
+
+ echo "::group::Build"
+ cmake --build .
+ echo "::endgroup::"
- name: Test
shell: bash