YGGverse
/
hlsdk-portable
mirror of https://github.com/YGGverse/hlsdk-portable.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into bshift

bshift
Andrey Akhmichin 2 years ago
parent
ef4826d5e0 06521e8950
commit
1ecd62979e
No known key found for this signature in database
GPG Key ID: 1F180D249B0643C0
2 changed files with 18 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      .github/workflows/build.yml
  2. 16
      .github/workflows/manual.yml

20
.github/workflows/build.yml
Unescape View File

@ -22,20 +22,20 @@ jobs:
CXX: ${{ matrix.cxx }} CXX: ${{ matrix.cxx }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: Checkout steam-runtime - name: Checkout steam-runtime
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
repository: ValveSoftware/steam-runtime repository: ValveSoftware/steam-runtime
path: steam-runtime path: steam-runtime
- name: Cache steam-runtime - name: Cache steam-runtime
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
id: cache-steam-runtime id: cache-steam-runtime
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.tar.gz path: com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.tar.gz
key: ${{ runner.os }}-steam-runtime key: ${{ runner.os }}-steam-runtime
@ -65,7 +65,7 @@ jobs:
- name: Add msbuild to PATH - name: Add msbuild to PATH
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
uses: microsoft/setup-msbuild@v1.0.2 uses: microsoft/setup-msbuild@v1.1
- name: Build on Windows - name: Build on Windows
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
run: | run: |
@ -79,33 +79,33 @@ jobs:
- name: Extract branch name - name: Extract branch name
shell: bash shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/} | tr '/' '_')" run: echo "branch=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '_')" >> $GITHUB_OUTPUT
id: extract_branch id: extract_branch
- name: Extract gamedir - name: Extract gamedir
shell: bash shell: bash
run: echo "##[set-output name=gamedir;]$(grep build/CMakeCache.txt -Ee 'GAMEDIR:STRING=[a-z]+' | cut -d '=' -f 2)" run: echo "gamedir=$(grep build/CMakeCache.txt -Ee 'GAMEDIR:STRING=[a-z]+' | cut -d '=' -f 2)" >> $GITHUB_OUTPUT
id: extract_gamedir id: extract_gamedir
- name: Upload linux artifact - name: Upload linux artifact
if: startsWith(matrix.os, 'ubuntu') && matrix.cc == 'gcc' if: startsWith(matrix.os, 'ubuntu') && matrix.cc == 'gcc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: hlsdk-${{ steps.extract_branch.outputs.branch }}-linux name: hlsdk-${{ steps.extract_branch.outputs.branch }}-linux
path: dist/${{ steps.extract_gamedir.outputs.gamedir }} path: dist/${{ steps.extract_gamedir.outputs.gamedir }}
- name: Upload linux artifact with vgui - name: Upload linux artifact with vgui
if: startsWith(matrix.os, 'ubuntu') && matrix.cc == 'gcc' if: startsWith(matrix.os, 'ubuntu') && matrix.cc == 'gcc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: hlsdk-${{ steps.extract_branch.outputs.branch }}-linux-vgui name: hlsdk-${{ steps.extract_branch.outputs.branch }}-linux-vgui
path: dist-vgui/${{ steps.extract_gamedir.outputs.gamedir }} path: dist-vgui/${{ steps.extract_gamedir.outputs.gamedir }}
- name: Upload windows artifact - name: Upload windows artifact
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows
path: dist/${{ steps.extract_gamedir.outputs.gamedir }} path: dist/${{ steps.extract_gamedir.outputs.gamedir }}
- name: Upload windows artifact with vgui - name: Upload windows artifact with vgui
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows-vgui name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows-vgui
path: dist-vgui/${{ steps.extract_gamedir.outputs.gamedir }} path: dist-vgui/${{ steps.extract_gamedir.outputs.gamedir }}

16
.github/workflows/manual.yml
Unescape View File

@ -32,20 +32,20 @@ jobs:
CXX: ${{ matrix.cxx }} CXX: ${{ matrix.cxx }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: Checkout steam-runtime - name: Checkout steam-runtime
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
repository: ValveSoftware/steam-runtime repository: ValveSoftware/steam-runtime
path: steam-runtime path: steam-runtime
- name: Cache steam-runtime - name: Cache steam-runtime
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
id: cache-steam-runtime id: cache-steam-runtime
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.tar.gz path: com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.tar.gz
key: ${{ runner.os }}-steam-runtime key: ${{ runner.os }}-steam-runtime
@ -73,7 +73,7 @@ jobs:
- name: Add msbuild to PATH - name: Add msbuild to PATH
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
uses: microsoft/setup-msbuild@v1.0.2 uses: microsoft/setup-msbuild@v1.1
- name: Build on Windows - name: Build on Windows
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
run: | run: |
@ -82,11 +82,11 @@ jobs:
- name: Extract branch name - name: Extract branch name
shell: bash shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/} | tr '/' '_')" run: echo "branch=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '_')" >> $GITHUB_OUTPUT
id: extract_branch id: extract_branch
- name: Extract gamedir - name: Extract gamedir
shell: bash shell: bash
run: echo "##[set-output name=gamedir;]$(grep build/CMakeCache.txt -Ee 'GAMEDIR:STRING=[a-z]+' | cut -d '=' -f 2)" run: echo "gamedir=$(grep build/CMakeCache.txt -Ee 'GAMEDIR:STRING=[a-z]+' | cut -d '=' -f 2)" >> $GITHUB_OUTPUT
id: extract_gamedir id: extract_gamedir
- name: Copy pdbs to dist dir - name: Copy pdbs to dist dir
if: ${{ startsWith(matrix.os, 'windows') && github.event.inputs.buildtype == 'Debug' }} if: ${{ startsWith(matrix.os, 'windows') && github.event.inputs.buildtype == 'Debug' }}
@ -100,13 +100,13 @@ jobs:
Remove-Item -Force -Path dist/${{ steps.extract_gamedir.outputs.gamedir }}/dlls/hl.lib Remove-Item -Force -Path dist/${{ steps.extract_gamedir.outputs.gamedir }}/dlls/hl.lib
- name: Upload linux artifact - name: Upload linux artifact
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: hlsdk-${{ steps.extract_branch.outputs.branch }}-linux name: hlsdk-${{ steps.extract_branch.outputs.branch }}-linux
path: dist/${{ steps.extract_gamedir.outputs.gamedir }} path: dist/${{ steps.extract_gamedir.outputs.gamedir }}
- name: Upload windows artifact - name: Upload windows artifact
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows
path: dist/${{ steps.extract_gamedir.outputs.gamedir }} path: dist/${{ steps.extract_gamedir.outputs.gamedir }}

Write Preview
Loading…
Cancel
Save