fix conflict

TeamPiplup · May 1, 2024 · 9c0ac00 · 9c0ac00
2 parents 3c2b399 + 497b5b4
commit 9c0ac00
Show file tree

Hide file tree

Showing 10 changed files with 818 additions and 150 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,4 @@
+/Server/bin/
+/Server/obj/
+/Shared/bin/
+/Shared/obj/
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -73,3 +73,35 @@ jobs:
         platforms  : linux/amd64,linux/arm/v7,linux/arm64/v8
         cache-from : type=gha,scope=${{ github.workflow }}
         cache-to   : type=gha,scope=${{ github.workflow }},mode=max
+    -
+      name: Build binary files
+      run: |
+        ./docker-build.sh  all
+    -
+      name : Upload Server
+      uses : actions/upload-artifact@v3
+      with:
+        name              : Server
+        path              : ./bin/Server
+        if-no-files-found : error
+    -
+      name : Upload Server.arm
+      uses : actions/upload-artifact@v3
+      with:
+        name              : Server.arm
+        path              : ./bin/Server.arm
+        if-no-files-found : error
+    -
+      name : Upload Server.arm64
+      uses : actions/upload-artifact@v3
+      with:
+        name              : Server.arm64
+        path              : ./bin/Server.arm64
+        if-no-files-found : error
+    -
+      name : Upload Server.exe
+      uses : actions/upload-artifact@v3
+      with:
+        name              : Server.exe
+        path              : ./bin/Server.exe
+        if-no-files-found : error
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,6 @@ riderModule.iml
 .idea/
 settings.json
 .vs/
+
+/cache/
+/data/