Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Vauff committed Feb 29, 2024
2 parents 8d0b977 + a152f5b commit 3c55be5
Show file tree
Hide file tree
Showing 8 changed files with 165 additions and 352 deletions.
21 changes: 7 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
name: CI

on:
push:
branches:
- main
tags:
- '*'
pull_request:
branches:
- main
on: [push, pull_request]

jobs:
build:
Expand All @@ -28,6 +20,7 @@ jobs:
uses: actions/checkout@v4
with:
path: MovementUnlocker
submodules: recursive

- name: Checkout Metamod
uses: actions/checkout@v4
Expand Down Expand Up @@ -59,11 +52,11 @@ jobs:
shell: bash
run: |
mkdir build && cd build
python ../configure.py --enable-optimize --symbol-files --sdks cs2
python ../configure.py --enable-optimize --symbol-files --sdks cs2 --hl2sdk-manifests hl2sdk-manifests/
ambuild
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ runner.os }}
path: MovementUnlocker/build/package
Expand All @@ -76,20 +69,20 @@ jobs:

steps:
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4

- name: Package
run: |
version=`echo $GITHUB_REF | sed "s/refs\/tags\///"`
ls -Rall
if [ -d "./Linux/" ]; then
cd ./Linux/
tar -czf ../${{ github.event.repository.name }}-${version}-linux.tar.gz addons
tar -czf ../${{ github.event.repository.name }}-${version}-linux.tar.gz *
cd -
fi
if [ -d "./Windows/" ]; then
cd ./Windows/
zip -r ../${{ github.event.repository.name }}-${version}-windows.zip addons
zip -r ../${{ github.event.repository.name }}-${version}-windows.zip *
cd -
fi
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "hl2sdk-manifests"]
path = hl2sdk-manifests
url = https://github.com/alliedmodders/hl2sdk-manifests.git
Loading

0 comments on commit 3c55be5

Please sign in to comment.