Merge branch 'main' of https://github.com/Lan2Play/PugSharp

Lan2Play · Nov 2, 2023 · b79ef44 · b79ef44
2 parents 4bbd287 + ac59c46
commit b79ef44
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml
@@ -20,6 +20,12 @@ on:
     - '**'
     - '!README.md'
     - '!Makefile'
+
+env:
+  DOTNET_RUNTIME_URL: https://download.visualstudio.microsoft.com/download/pr/dc2c0a53-85a8-4fda-a283-fa28adb5fbe2/8ccade5bc400a5bb40cd9240f003b45c/aspnetcore-runtime-7.0.11-linux-x64.tar.gz
+  DOTNET_RUNTIME_VERSION: 7.0.11
+
+
 jobs:
 
   # test_linux_x64:
@@ -105,15 +111,21 @@ jobs:
         run: rm -rf PugSharp/bin/Debug/net7.0/publish/CounterStrikeSharp.API.dll      
       - name: prepare package structure
         run: mkdir -p packagebuild/addons/counterstrikesharp/plugins/PugSharp
+      - name: copy included counterstrikesharp
+        run: cp -rf PugSharp/counterstrikesharp packagebuild/addons/counterstrikesharp
+      - name: copy included counterstrikesharp vdf
+        run: cp -rf PugSharp/metamod packagebuild/addons/metamod
       - name: copy package content
         run: cp -rf PugSharp/bin/Debug/net7.0/publish/* packagebuild/addons/counterstrikesharp/plugins/PugSharp
+      - name: Add dotnet runtime
+        run: |
+          mkdir -p packagebuild/addons/counterstrikesharp/dotnet
+          curl -s -L $DOTNET_RUNTIME_URL \
+          | tar xvz -C packagebuild/addons/counterstrikesharp/dotnet
+          mv packagebuild/addons/counterstrikesharp/dotnet/shared/Microsoft.NETCore.App/$DOTNET_RUNTIME_VERSION/* packagebuild/addons/counterstrikesharp/dotnet/shared/Microsoft.NETCore.App/
       - name: build package
         run: zip -r PugSharp_$PUGSHARPNETVER.zip addons
         working-directory: ./packagebuild
-      - name: ls
-        run: ls -la
-      - name: find
-        run: find .
       - name: replace version variable in meta files
         run: sed -i "s|%%VERSION%%|$PUGSHARPNETVER|g" ./release.json;       
       - name: replace CounterStrikeSharpVersion variable in meta files