Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit aa8cfff

Browse files
authored
Merge branch 'Sectonidse:master' into master
2 parents c17b83b + 34d92c8 commit aa8cfff

File tree

2 files changed

+26
-40
lines changed

2 files changed

+26
-40
lines changed

.github/workflows/compile.yml

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,17 @@
33
# separate terms of service, privacy policy, and support
44
# documentation.
55

6-
name: Windows 32bit
6+
name: Game
77

88
on:
99
push:
1010
branches: [ "master" ]
11+
paths:
12+
- common/**
13+
- devtools/**
14+
- game/**
15+
- public/**
16+
- responserules/**
1117
pull_request:
1218
branches: [ "master" ]
1319

@@ -18,30 +24,13 @@ env:
1824
# Configuration type to build.
1925
# You can convert this to a build matrix if you need coverage of multiple configuration types.
2026
# https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
21-
BUILD_CONFIGURATION: Release
27+
BUILD_CONFIGURATION: Debug
2228

2329
permissions:
2430
contents: read
2531

2632
jobs:
27-
Shaders:
28-
runs-on: windows-latest
29-
steps:
30-
- uses: actions/checkout@v4
31-
32-
# ENABLE THIS ON FIRST TIME SETUP
33-
#- name: Install Strawberry Perl for Shaders compilation
34-
# run: choco install strawberryperl
35-
36-
- name: Install Shader Dependencies
37-
run: cpan String::CRC32
38-
39-
- name: Compile Shaders
40-
working-directory: ${{env.GITHUB_WORKSPACE}}
41-
run: ./materialsystem/swarmshaders/buildshaders.bat deferred_shaders
42-
43-
44-
Game:
33+
Windows:
4534
runs-on: windows-latest
4635
steps:
4736
- uses: actions/checkout@v4

.github/workflows/msbuild.yml renamed to .github/workflows/shader.yml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
# separate terms of service, privacy policy, and support
44
# documentation.
55

6-
name: MSBuild
6+
name: Shaders
77

88
on:
99
push:
1010
branches: [ "master" ]
11+
paths:
12+
- materialsystem/**
1113
pull_request:
1214
branches: [ "master" ]
15+
paths:
16+
- materialsystem/**
1317

1418
env:
1519
# Path to the solution file relative to the root of the project.
@@ -18,31 +22,24 @@ env:
1822
# Configuration type to build.
1923
# You can convert this to a build matrix if you need coverage of multiple configuration types.
2024
# https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
21-
BUILD_CONFIGURATION: Release
25+
BUILD_CONFIGURATION: Debug
2226

2327
permissions:
2428
contents: read
2529

2630
jobs:
27-
build:
31+
Main:
2832
runs-on: windows-latest
29-
3033
steps:
3134
- uses: actions/checkout@v4
32-
33-
- name: Add MSBuild to PATH
34-
uses: microsoft/[email protected]
35-
36-
#- name: Restore NuGet packages
37-
# working-directory: ${{env.GITHUB_WORKSPACE}}
38-
# run: nuget restore ${{env.SOLUTION_FILE_PATH}}
39-
40-
- name: Install support for Visual Studio 2010..?
41-
run: choco install microsoft-build-tools-2013
42-
43-
- name: Build
35+
- uses: shogo82148/actions-setup-perl@v1
36+
with:
37+
perl-version: "5.32"
38+
distribution: strawberry
39+
40+
#- name: Install Shader Dependencies
41+
#run: cpan String::CRC32
42+
43+
- name: Compile Shaders
4444
working-directory: ${{env.GITHUB_WORKSPACE}}
45-
# Add additional options to the MSBuild command line here (like platform or verbosity level).
46-
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
47-
run: |
48-
& "C:/Program Files (x86)/MSBuild/12.0/Bin/MSBuild.exe" /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
45+
run: ./materialsystem/swarmshaders/buildshaders.bat deferred_shaders

0 commit comments

Comments
 (0)