Skip to content

Commit a5110f6

Browse files
RaphaelIT7RaphaelIT7
authored
Merge branch 'main' into autorefresh-module-pr
2 parents 8bec878 + b23d8a0 commit a5110f6

File tree

99 files changed

+3917
-698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+3917
-698
lines changed

‎.github/workflows/compile.yml‎

Lines changed: 104 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ jobs:
181181
182182
mkdir -p garrysmod/addons
183183
mv ${{ matrix.vdf }} garrysmod/addons
184+
mv gluatests/binaries/*.dll garrysmod/lua/bin/
184185
mv gluatests garrysmod/addons
185186
186187
tar -czf gluatest.tar.gz ${{ matrix.ghostinj }} garrysmod/
@@ -205,100 +206,173 @@ jobs:
205206
test_32bit:
206207
name: "Test 32x branches"
207208
needs: setup_artifacts
208-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
209+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
209210
strategy:
210211
matrix:
211212
branch:
212-
- live
213+
- public
213214
- dev
214215
- prerelease
215216
with:
216217
extra-startup-args: "-usegh"
217218
download-artifact: "gluatest_32x"
218219
no-checkout: "true"
220+
branch: ${{ matrix.branch }}
221+
secrets:
222+
secret-additional-setup: "mkdir -p garrysmod/ && echo ${{ secrets.LOKI_HOST }} > garrysmod/loki_host.txt && echo ${{ secrets.LOKI_APIKEY }} > garrysmod/loki_api.txt && tar -czf gluatest/docker/_gluatest_artifacts/gm_secrets.tar.gz -C . garrysmod && rm -r garrysmod"
219223

220224
test_32bit_noghostinj:
221225
name: "Test 32x branches (No GhostInj)"
222226
needs: setup_artifacts
223-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
227+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
224228
strategy:
225229
matrix:
226230
branch:
227-
- live
231+
- public
228232
- dev
229233
- prerelease
230234
with:
231235
download-artifact: "gluatest_no_ghostinj_32x"
232236
no-checkout: "true"
237+
branch: ${{ matrix.branch }}
238+
secrets:
239+
secret-additional-setup: "mkdir -p garrysmod/ && echo ${{ secrets.LOKI_HOST }} > garrysmod/loki_host.txt && echo ${{ secrets.LOKI_APIKEY }} > garrysmod/loki_api.txt && tar -czf gluatest/docker/_gluatest_artifacts/gm_secrets.tar.gz -C . garrysmod && rm -r garrysmod"
233240

234241
test_64bit:
235242
name: "Test x86-64 branch"
236243
needs: setup_artifacts
237-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
244+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
238245
with:
239246
branch: x86-64
240247
extra-startup-args: "-usegh"
241248
download-artifact: "gluatest_64x"
242249
no-checkout: "true"
250+
secrets:
251+
secret-additional-setup: "mkdir -p garrysmod/ && echo ${{ secrets.LOKI_HOST }} > garrysmod/loki_host.txt && echo ${{ secrets.LOKI_APIKEY }} > garrysmod/loki_api.txt && tar -czf gluatest/docker/_gluatest_artifacts/gm_secrets.tar.gz -C . garrysmod && rm -r garrysmod"
243252

244253
test_64bit_noghostinj:
245254
name: "Test x86-64 branch (No GhostInj)"
246255
needs: setup_artifacts
247-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
256+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
248257
with:
249258
branch: x86-64
250259
download-artifact: "gluatest_no_ghostinj_64x"
251260
no-checkout: "true"
261+
secrets:
262+
secret-additional-setup: "mkdir -p garrysmod/ && echo ${{ secrets.LOKI_HOST }} > garrysmod/loki_host.txt && echo ${{ secrets.LOKI_APIKEY }} > garrysmod/loki_api.txt && tar -czf gluatest/docker/_gluatest_artifacts/gm_secrets.tar.gz -C . garrysmod && rm -r garrysmod"
252263

253264
test_32x_holylua:
254265
name: "Test 32x branches (HolyLua)"
255266
needs: setup_artifacts
256-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
267+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
257268
strategy:
258269
matrix:
259270
branch:
260-
- live
271+
- public
261272
- dev
262273
- prerelease
263274
with:
264275
extra-startup-args: "-usegh -holylib_lua +holylib_module_debug 0"
265276
download-artifact: "gluatest_32x"
266277
no-checkout: "true"
278+
branch: ${{ matrix.branch }}
279+
secrets:
280+
secret-additional-setup: "mkdir -p garrysmod/ && echo ${{ secrets.LOKI_HOST }} > garrysmod/loki_host.txt && echo ${{ secrets.LOKI_APIKEY }} > garrysmod/loki_api.txt && tar -czf gluatest/docker/_gluatest_artifacts/gm_secrets.tar.gz -C . garrysmod && rm -r garrysmod"
267281

268282
test_32x_holylua_noghostinj:
269283
name: "Test 32x branches (HolyLua, No GhostInj)"
270284
needs: setup_artifacts
271-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
285+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
272286
strategy:
273287
matrix:
274288
branch:
275-
- live
289+
- public
276290
- dev
277291
- prerelease
278292
with:
279293
extra-startup-args: "-holylib_lua +holylib_module_debug 0"
280294
download-artifact: "gluatest_no_ghostinj_32x"
281295
no-checkout: "true"
296+
branch: ${{ matrix.branch }}
297+
secrets:
298+
secret-additional-setup: "mkdir -p garrysmod/ && echo ${{ secrets.LOKI_HOST }} > garrysmod/loki_host.txt && echo ${{ secrets.LOKI_APIKEY }} > garrysmod/loki_api.txt && tar -czf gluatest/docker/_gluatest_artifacts/gm_secrets.tar.gz -C . garrysmod && rm -r garrysmod"
282299

283300
test_64bit_holylua:
284301
name: "Test x86-64 branch (HolyLua)"
285302
needs: setup_artifacts
286-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
303+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
287304
with:
288305
branch: x86-64
289306
extra-startup-args: "-usegh -holylib_lua +holylib_module_debug 0"
290307
download-artifact: "gluatest_64x"
291308
no-checkout: "true"
309+
secrets:
310+
secret-additional-setup: "mkdir -p garrysmod/ && echo ${{ secrets.LOKI_HOST }} > garrysmod/loki_host.txt && echo ${{ secrets.LOKI_APIKEY }} > garrysmod/loki_api.txt && tar -czf gluatest/docker/_gluatest_artifacts/gm_secrets.tar.gz -C . garrysmod && rm -r garrysmod"
292311

293312
test_64bit_holylua_noghostinj:
294313
name: "Test x86-64 branch (HolyLua, No GhostInj)"
295314
needs: setup_artifacts
296-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
315+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
297316
with:
298317
branch: x86-64
299318
extra-startup-args: "-holylib_lua +holylib_module_debug 0"
300319
download-artifact: "gluatest_no_ghostinj_64x"
301320
no-checkout: "true"
321+
secrets:
322+
secret-additional-setup: "mkdir -p garrysmod/ && echo ${{ secrets.LOKI_HOST }} > garrysmod/loki_host.txt && echo ${{ secrets.LOKI_APIKEY }} > garrysmod/loki_api.txt && tar -czf gluatest/docker/_gluatest_artifacts/gm_secrets.tar.gz -C . garrysmod && rm -r garrysmod"
323+
324+
test_32x_luajit:
325+
name: "Test 32x branches (LuaJIT)"
326+
needs: setup_artifacts
327+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
328+
strategy:
329+
matrix:
330+
branch:
331+
- public
332+
- dev
333+
- prerelease
334+
with:
335+
extra-startup-args: "-usegh -holylib_enable_luajit 1 +holylib_module_debug 0"
336+
download-artifact: "gluatest_32x"
337+
no-checkout: "true"
338+
branch: ${{ matrix.branch }}
339+
secrets:
340+
secret-additional-setup: "mkdir -p garrysmod/ && echo ${{ secrets.LOKI_HOST }} > garrysmod/loki_host.txt && echo ${{ secrets.LOKI_APIKEY }} > garrysmod/loki_api.txt && tar -czf gluatest/docker/_gluatest_artifacts/gm_secrets.tar.gz -C . garrysmod && rm -r garrysmod"
341+
342+
test_64bit_luajit:
343+
name: "Test x86-64 branch (LuaJIT)"
344+
needs: setup_artifacts
345+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
346+
with:
347+
branch: x86-64
348+
extra-startup-args: "-usegh -holylib_enable_luajit 1 +holylib_module_debug 0"
349+
download-artifact: "gluatest_64x"
350+
no-checkout: "true"
351+
secrets:
352+
secret-additional-setup: "mkdir -p garrysmod/ && echo ${{ secrets.LOKI_HOST }} > garrysmod/loki_host.txt && echo ${{ secrets.LOKI_APIKEY }} > garrysmod/loki_api.txt && tar -czf gluatest/docker/_gluatest_artifacts/gm_secrets.tar.gz -C . garrysmod && rm -r garrysmod"
353+
354+
# -------
355+
# HolyLib Build summary DLL jobs
356+
# -------
357+
358+
generate_test_summary:
359+
name: "Generate Summary"
360+
needs: [test_32bit, test_32bit_noghostinj, test_64bit, test_64bit_noghostinj, test_32x_holylua, test_32x_holylua_noghostinj, test_64bit_holylua, test_64bit_holylua_noghostinj, test_32x_luajit, test_64bit_luajit]
361+
runs-on: ubuntu-latest
362+
container: raphaelit7/gmod-builder:latest_64x
363+
steps:
364+
- uses: actions/checkout@v4
365+
name: "Checkout build tool files"
366+
with:
367+
sparse-checkout: source/_prebuildtools
368+
369+
- name: "Generate Summary"
370+
run: |
371+
cd source/_prebuildtools
372+
chmod +x luajit_64
373+
./luajit_64 _workflow_summary.lua "${{secrets.LOKI_HOST}}" "${{secrets.LOKI_APIKEY}}" "${{github.run_number}}"
374+
375+
echo "$(cat generated_summary.md)" > $GITHUB_STEP_SUMMARY
302376
303377
# --------------------
304378
# HolyLib - gmod_tests
@@ -318,7 +392,7 @@ jobs:
318392
name: "Checkout gmod_tests repo"
319393
with:
320394
sparse-checkout: lua
321-
repository: 'CFC-Servers/gmod_tests'
395+
repository: 'RaphaelIT7/gmod_tests'
322396
path: 'gmod_tests'
323397

324398
- uses: actions/download-artifact@v4
@@ -361,17 +435,18 @@ jobs:
361435
test_gmod_tests_32bit:
362436
name: "Test 32x branches (gmod_tests)"
363437
needs: setup_gmod_tests_artifacts
364-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
438+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
365439
strategy:
366440
matrix:
367441
branch:
368-
- live
442+
- public
369443
- dev
370444
- prerelease
371445
artifact:
372446
- gmod_tests_32x
373447
- gmod_tests_no_ghostinj_32x
374448
with:
449+
branch: ${{ matrix.branch }}
375450
extra-startup-args: "-usegh -maxplayers 64"
376451
download-artifact: ${{ matrix.artifact }}
377452
no-checkout: "true"
@@ -381,7 +456,7 @@ jobs:
381456
test_gmod_tests_64bit:
382457
name: "Test x86-64 branch (gmod_tests)"
383458
needs: setup_gmod_tests_artifacts
384-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
459+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
385460
strategy:
386461
matrix:
387462
artifact:
@@ -398,17 +473,18 @@ jobs:
398473
test_gmod_tests_32bit_with_ivpreplacement:
399474
name: "Test 32x branches (gmod_tests & VPhysics replacement)"
400475
needs: setup_gmod_tests_artifacts
401-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
476+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
402477
strategy:
403478
matrix:
404479
branch:
405-
- live
480+
- public
406481
- dev
407482
- prerelease
408483
artifact:
409484
- gmod_tests_32x
410485
- gmod_tests_no_ghostinj_32x
411486
with:
487+
branch: ${{ matrix.branch }}
412488
extra-startup-args: "-usegh -maxplayers 64 -holylib_replaceivp"
413489
download-artifact: ${{ matrix.artifact }}
414490
no-checkout: "true"
@@ -418,7 +494,7 @@ jobs:
418494
test_gmod_tests_64bit_with_ivpreplacement:
419495
name: "Test x86-64 branch (gmod_tests & VPhysics replacement)"
420496
needs: setup_gmod_tests_artifacts
421-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
497+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
422498
strategy:
423499
matrix:
424500
artifact:
@@ -436,7 +512,7 @@ jobs:
436512
if: false # always() Enable it if a unknown crash is happening. We'll test every single module.
437513
name: "Find the crash cause"
438514
needs: setup_artifacts
439-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
515+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
440516
strategy:
441517
fail-fast: false
442518
matrix:
@@ -558,36 +634,38 @@ jobs:
558634
test_exampledll_32bit:
559635
name: "Test ExampleDLL 32x branches"
560636
needs: setup_exampledll_artifacts
561-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
637+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
562638
strategy:
563639
matrix:
564640
branch:
565-
- live
641+
- public
566642
- dev
567643
- prerelease
568644
with:
645+
branch: ${{ matrix.branch }}
569646
extra-startup-args: "-usegh"
570647
download-artifact: "gluatest_exampledll_32x"
571648
no-checkout: "true"
572649

573650
test_exampledll_32bit_noghostinj:
574651
name: "Test ExampleDLL 32x branches (No GhostInj)"
575652
needs: setup_exampledll_artifacts
576-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
653+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
577654
strategy:
578655
matrix:
579656
branch:
580-
- live
657+
- public
581658
- dev
582659
- prerelease
583660
with:
661+
branch: ${{ matrix.branch }}
584662
download-artifact: "gluatest_exampledll_no_ghostinj_32x"
585663
no-checkout: "true"
586664

587665
test_exampledll_64bit:
588666
name: "Test ExampleDLL x86-64 branch"
589667
needs: setup_exampledll_artifacts
590-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
668+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
591669
with:
592670
branch: x86-64
593671
extra-startup-args: "-usegh"
@@ -597,7 +675,7 @@ jobs:
597675
test_exampledll_64bit_noghostinj:
598676
name: "Test ExampleDLL x86-64 branch (No GhostInj)"
599677
needs: setup_exampledll_artifacts
600-
uses: CFC-Servers/GLuaTest/.github/workflows/run_tests.yml@main
678+
uses: RaphaelIT7/GLuaTest/.github/workflows/run_tests.yml@holylib_v2
601679
with:
602680
branch: x86-64
603681
download-artifact: "gluatest_exampledll_no_ghostinj_64x"

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ ghostinj-dll/ghostinj.dll
2323
ghostinj-dll/premake5.exe
2424
source/lua/scripts/VectorFFI.h
2525
source/_versioninfo.h
26+
source/_prebuildtools/http/*.txt
27+
source/_prebuildtools/generated_summary.md

0 commit comments

Comments
 (0)