diff options
| author |  Sadie Powell | 2025-04-16 20:30:58 +0100 |
|---|---|---|
| committer | Sadie Powell | 2025-04-16 20:30:58 +0100 |
| commit | 42fce9e1a8cec1dd9a8df21b899bc4ecad33303a (patch) | |
| tree | 558270641dda71663ee86b3990e9ebeccbf8e686 | |
| parent | Remove the {fmt} headers that we don't use. (diff) | |
| parent | Use windows-2025 for the Windows CI. (diff) | |
Merge branch 'insp3' into insp4.
| -rw-r--r-- | .github/workflows/ci-windows.yml | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 573fff818..2d5f0ef2b 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -10,7 +10,10 @@ on: jobs: build: if: "!contains(github.event.head_commit.message, '[skip windows ci]')" - runs-on: windows-2019 + runs-on: windows-2025 + env: + CONAN_USER_HOME: ${{ github.workspace }}/win/build + CONAN_USER_HOME_SHORT: None steps: - uses: actions/checkout@v4 @@ -24,23 +27,37 @@ jobs: with: version: 1.66.0 + - name: Try to restore libraries from the cache + uses: actions/cache/restore@v4 + id: library-cache + with: + key: conan-${{ hashFiles('win/conanfile.txt') }} + path: ${{ env.CONAN_USER_HOME }}/.conan + - name: Install libraries working-directory: ${{ github.workspace }}/win/build run: | (Get-Content ../conanfile.txt).replace('##', '') | Set-Content ../conanfile.txt conan install .. --build=missing + - name: Save libraries to the cache + if: ${{ steps.library-cache.outputs.cache-hit != 'true' }} + uses: actions/cache/save@v4 + with: + key: ${{ steps.library-cache.outputs.cache-primary-key }} + path: ${{ env.CONAN_USER_HOME }}/.conan + - name: Run CMake working-directory: ${{ github.workspace }}/win/build env: LDFLAGS: /DEBUG:FASTLINK /INCREMENTAL run: | - cmake -A x64 -D CMAKE_BUILD_TYPE=${{ github.event_name == 'release' && 'Release' || 'Debug' }} -G "Visual Studio 16 2019" -Wdev .. + cmake -A x64 -D CMAKE_BUILD_TYPE=${{ github.event_name == 'release' && 'Release' || 'Debug' }} -G "Visual Studio 17 2022" -Wdev .. - name: Build InspIRCd working-directory: ${{ github.workspace }}/win/build run: | - msbuild PACKAGE.vcxproj /M:3 /P:Configuration=${{ github.event_name == 'release' && 'Release' || 'Debug' }} /P:Platform=x64 /VERBOSITY:MINIMAL + msbuild PACKAGE.vcxproj /M:5 /P:Configuration=${{ github.event_name == 'release' && 'Release' || 'Debug' }} /P:Platform=x64 /VERBOSITY:MINIMAL - name: Upload installer if: "${{ github.event_name == 'release' }}" |