Skip to content

Commit

Permalink
internal: make 1.5/1.6 builds single GHA workflow (skyrim-multiplayer…
Browse files Browse the repository at this point in the history
  • Loading branch information
Pospelove authored Apr 20, 2024
1 parent f30da2b commit ededc73
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 159 deletions.
155 changes: 0 additions & 155 deletions .github/workflows/pr-windows-ae.yml

This file was deleted.

16 changes: 12 additions & 4 deletions .github/workflows/pr-windows.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: PR Windows - Special Edition 1.5 (Old)
name: PR Windows

on:
push:
Expand All @@ -19,6 +19,14 @@ jobs:
# VS 2019 is still supported, but GitHub windows-2019 runners have unsupported WinSDK version
runs-on: windows-2022

strategy:
matrix:
include:
- SKYRIM_SE_FLAG: ON
SP_NEXUS_ARTIFACT_NAME: SP-SE-nexus
- SKYRIM_SE_FLAG: OFF
SP_NEXUS_ARTIFACT_NAME: SP-AE-nexus

steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -76,14 +84,14 @@ jobs:
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
# Outputs profiling data in Google Trace Format, which can be parsed by the about:tracing tab of Google Chrome or using a plugin for a tool like Trace Compass.
run: >
run: >
cmake -B ${{github.workspace}}/build
-DVCPKG_ROOT=C:/vcpkg
-DCPPCOV_PATH="C:\Program Files\OpenCppCoverage"
-DUNIT_DATA_DIR="skyrim_data_files"
-DPREPARE_NEXUS_ARCHIVES=ON
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-DSKYRIM_SE=ON
-DSKYRIM_SE=${{ matrix.SKYRIM_SE_FLAG }}
--profiling-output cmake-profiling-output
--profiling-format google-trace
Expand Down Expand Up @@ -118,7 +126,7 @@ jobs:

- uses: actions/upload-artifact@v3
with:
name: SP-SE-nexus
name: ${{ matrix.SP_NEXUS_ARTIFACT_NAME }}
# Data folder is skipped for mod managers
path: ${{github.workspace}}/build/nexus/sp/data/*
- uses: actions/upload-artifact@v3
Expand Down

0 comments on commit ededc73

Please sign in to comment.