Skip to content

Commit

Permalink
Merge remote-tracking branch 'Half-LifeUpdated/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
JoelTroch committed May 3, 2024
2 parents 5823d2d + afabe33 commit 97b5412
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
compiler: [g++, clang++]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install G++ Multilib, Clang++ & OpenGL library
run: |
Expand All @@ -24,7 +24,7 @@ jobs:
make COMPILER=${{ matrix.compiler }} CFG=release -j2
- name: Deploy
uses: actions/upload-artifact@v3.1.0
uses: actions/upload-artifact@v4
with:
name: Linux-x86-${{ matrix.compiler }}
path: |
Expand All @@ -38,18 +38,18 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1
- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x86

- name: Build
run: msbuild projects/vs2019/projects.sln -t:rebuild -property:Configuration=Release -maxcpucount:2

- name: Deploy
uses: actions/upload-artifact@v3.1.0
uses: actions/upload-artifact@v4
with:
name: Win32
path: |
Expand Down

0 comments on commit 97b5412

Please sign in to comment.