Skip to content

Commit 3c55be5

Browse files
committed
Merge branch 'dev' into main
2 parents 8d0b977 + a152f5b commit 3c55be5

8 files changed

Lines changed: 165 additions & 352 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
name: CI
22

3-
on:
4-
push:
5-
branches:
6-
- main
7-
tags:
8-
- '*'
9-
pull_request:
10-
branches:
11-
- main
3+
on: [push, pull_request]
124

135
jobs:
146
build:
@@ -28,6 +20,7 @@ jobs:
2820
uses: actions/checkout@v4
2921
with:
3022
path: MovementUnlocker
23+
submodules: recursive
3124

3225
- name: Checkout Metamod
3326
uses: actions/checkout@v4
@@ -59,11 +52,11 @@ jobs:
5952
shell: bash
6053
run: |
6154
mkdir build && cd build
62-
python ../configure.py --enable-optimize --symbol-files --sdks cs2
55+
python ../configure.py --enable-optimize --symbol-files --sdks cs2 --hl2sdk-manifests hl2sdk-manifests/
6356
ambuild
6457
6558
- name: Upload artifact
66-
uses: actions/upload-artifact@v3
59+
uses: actions/upload-artifact@v4
6760
with:
6861
name: ${{ runner.os }}
6962
path: MovementUnlocker/build/package
@@ -76,20 +69,20 @@ jobs:
7669

7770
steps:
7871
- name: Download artifacts
79-
uses: actions/download-artifact@v3
72+
uses: actions/download-artifact@v4
8073

8174
- name: Package
8275
run: |
8376
version=`echo $GITHUB_REF | sed "s/refs\/tags\///"`
8477
ls -Rall
8578
if [ -d "./Linux/" ]; then
8679
cd ./Linux/
87-
tar -czf ../${{ github.event.repository.name }}-${version}-linux.tar.gz addons
80+
tar -czf ../${{ github.event.repository.name }}-${version}-linux.tar.gz *
8881
cd -
8982
fi
9083
if [ -d "./Windows/" ]; then
9184
cd ./Windows/
92-
zip -r ../${{ github.event.repository.name }}-${version}-windows.zip addons
85+
zip -r ../${{ github.event.repository.name }}-${version}-windows.zip *
9386
cd -
9487
fi
9588

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "hl2sdk-manifests"]
2+
path = hl2sdk-manifests
3+
url = https://github.com/alliedmodders/hl2sdk-manifests.git

0 commit comments

Comments
 (0)