Merge pull request #323 from hybrasyl/develop

Hybrasyl Server 0.9.4

Author: baughj

.github/workflows/hybrasyl-build.yml

@@ -2,7 +2,6 @@
 name: Hybrasyl packaging and testing
 
 on:
-  workflow_dispatch:
   push:
     paths-ignore:
       - 'contrib/**'
@@ -12,25 +11,26 @@ on:
       - main
       - develop
   pull_request:
-    paths-ignore:
-      - 'contrib/**'
-      - '**.md'
-      - '.github/**'
+    branches: [ main ]  
+  workflow_dispatch:
     branches:
       - main
       - develop
 
+permissions:
+  packages: write
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
     environment: deploy
     if: github.repository == 'hybrasyl/server'
     container:
       image: public.ecr.aws/l6u7z4o9/hybrasyl:build-latest
-
     strategy:
       matrix:
-        dotnet-version: ['7.0.x']
+        dotnet-version: ['8.0.x']
 
     steps:
       - name: start local redis 
@@ -48,9 +48,7 @@ jobs:
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
       - name: generate test config
         run: >
-          echo "{ \"WorldDataDirectory\": \"$GITHUB_WORKSPACE/ceridwen/xml\",
-          \"LogDataDirectory\": \"$GITHUB_WORKSPACE/ceridwen/logs\",
-          \"DataDirectory\": \"$GITHUB_WORKSPACE/ceridwen\"}"
+          echo -e "{\n  \"Directories\": {\n    \"Linux\": {\n      \"WorldDataDirectory\": \"$GITHUB_WORKSPACE\\/ceridwen\\/xml\",\n      \"LogDirectory\": \"$GITHUB_WORKSPACE\\/ceridwen\\/logs\",\n      \"DataDirectory\": \"$GITHUB_WORKSPACE\\/ceridwen\"\n    }\n  }\n}\n"
           > $GITHUB_WORKSPACE/server/Hybrasyl.Tests/hybrasyltest-settings.json
         shell: bash
       - name: show config
@@ -65,28 +63,30 @@ jobs:
           REDIS_HOST: localhost
           REDIS_PORT: 6379
       - name: Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/[email protected]
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           fail_ci_if_error: true
           verbose: true
       - name: Create release directory
         run: mkdir /releases
       - name: Publish Win64
         run: >
-          cd $GITHUB_WORKSPACE/server && dotnet publish -c Release -r win10-x64 &&
-          cd $GITHUB_WORKSPACE/server/hybrasyl/bin/Release/net7.0/win10-x64/publish &&
+          cd $GITHUB_WORKSPACE/server && dotnet publish -c Release -r win-x64 &&
+          cd $GITHUB_WORKSPACE/server/hybrasyl/bin/Release/net8.0/win-x64/publish &&
           echo "${SHORT_SHA}" > commit.txt &&
           zip -r /releases/HybrasylServer-${SHORT_SHA}-windows.zip .
       - name: Publish Linux
         run: >
-          cd $GITHUB_WORKSPACE/server && dotnet publish -c Release -r ubuntu.18.04-x64 &&
-          cd $GITHUB_WORKSPACE/server/hybrasyl/bin/Release/net7.0/ubuntu.18.04-x64/publish &&
+          cd $GITHUB_WORKSPACE/server && dotnet publish -c Release -r linux-x64 &&
+          cd $GITHUB_WORKSPACE/server/hybrasyl/bin/Release/net8.0/linux-x64/publish &&
           echo "${SHORT_SHA}" > commit.txt &&
           zip -r /releases/HybrasylServer-${SHORT_SHA}-linux.zip .
       - name: Publish MacOS
         run: >
           cd $GITHUB_WORKSPACE/server && dotnet publish -c Release -r osx-x64 &&
-          cd $GITHUB_WORKSPACE/server/hybrasyl/bin/Release/net7.0/osx-x64/publish &&
+          cd $GITHUB_WORKSPACE/server/hybrasyl/bin/Release/net8.0/osx-x64/publish &&
           echo "${SHORT_SHA}" > commit.txt &&
           zip -r /releases/HybrasylServer-${SHORT_SHA}-osx.zip .
       - name: Upload to current
@@ -115,6 +115,10 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}      
+#      - name: Upload to GHCR
+#        uses: KuhlTime/ghcr-action@v2
+#        with:
+#          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Notify discord
         run: >
           /usr/local/bin/discord.sh

.gitignore

@@ -281,15 +281,10 @@ __pycache__/
 **/hybrasyl/log.txt
 **/*.txt
 
-XML/api
-XML/articles
-XML/site
-XML/docfx.json
-XML/toc.yml
-
 hybrasyl/api
 hybrasyl/articles
 hybrasyl/site
+hybrasyl/_site
 hybrasyl/docfx.json
 hybrasyl/toc.yml
 

Dockerfile

@@ -4,9 +4,9 @@
 # and not a viable production server.
 #
 
-FROM mcr.microsoft.com/dotnet/runtime:7.0
+FROM mcr.microsoft.com/dotnet/runtime:8.0
 
-COPY /hybrasyl/bin/Release/net6.0/linux-x64 /App
+COPY /hybrasyl/bin/Release/net8.0/linux-x64 /App
 
 ENTRYPOINT ["dotnet", "/App/Hybrasyl.dll"]
 

Hybrasyl.Tests/BaseTests.cs

@@ -0,0 +1,24 @@
+// This file is part of Project Hybrasyl.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the Affero General Public License as published by
+// the Free Software Foundation, version 3.
+// 
+// This program is distributed in the hope that it will be useful, but
+// without ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the Affero General Public License
+// for more details.
+// 
+// You should have received a copy of the Affero General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+// 
+// (C) 2020-2023 ERISCO, LLC
+// 
+// For contributors and individual authors please refer to CONTRIBUTORS.MD.
+
+namespace Hybrasyl.Tests;
+
+
+// No really, disable parallelization 
+//[CollectionDefinition("Hybrasyl", DisableParallelization = true)]
+//public class HybrasylTestDefinitionClass { }

Hybrasyl.Tests/CastableRestrictions.cs

@@ -1,10 +1,23 @@
-using Hybrasyl;
-using Hybrasyl.Objects;
-using Hybrasyl.Tests;
-using Hybrasyl.Xml.Objects;
-using System.Drawing;
+// This file is part of Project Hybrasyl.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the Affero General Public License as published by
+// the Free Software Foundation, version 3.
+// 
+// This program is distributed in the hope that it will be useful, but
+// without ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the Affero General Public License
+// for more details.
+// 
+// You should have received a copy of the Affero General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+// 
+// (C) 2020-2023 ERISCO, LLC
+// 
+// For contributors and individual authors please refer to CONTRIBUTORS.MD.
+
 using System.Linq;
-using System.Numerics;
+using Hybrasyl.Xml.Objects;
 using Xunit;
 
 namespace Hybrasyl.Tests;
@@ -103,7 +116,6 @@ public void ForbidItem()
         Assert.True(Fixture.TestUser.UseCastable(castable));
         GiveItem("nochdaidh deum");
         Assert.True(Fixture.TestUser.UseCastable(castable));
-
     }
 
     [Fact]
@@ -169,7 +181,7 @@ public void RequireWeaponAny()
         GiveEquipment("Smol Sword");
         Assert.True(Fixture.TestUser.UseCastable(castable));
     }
-    
+
     [Fact]
     public void RequireWeaponType()
     {
@@ -425,23 +437,23 @@ public void TestForbidSlotAny()
     [Fact]
     public void TestForbidSlot()
     {
-       // <Item Slot="Foot" RestrictionType="NotEquipped" Message="err_forbid_slot">Testinium Foot</Item>
-       Fixture.TestUser.Inventory.Clear();
-       Fixture.TestUser.Equipment.Clear();
-
-       var castable = GetCastable("TestForbidSlot");
-
-       // Test requirement missing
-       GiveEquipment("Testinium Foot");
-       Assert.False(Fixture.TestUser.UseCastable(castable));
-       Assert.Equal("err_forbid_slot", Fixture.TestUser.LastSystemMessage);
-       Fixture.TestUser.Equipment.Clear();
-
-       // Test requirement succeeding
-       GiveEquipment("Testinium Foot2");
-       Assert.True(Fixture.TestUser.UseCastable(castable));
-       GiveEquipment("Testinium Claw");
-       Assert.True(Fixture.TestUser.UseCastable(castable));
+        // <Item Slot="Foot" RestrictionType="NotEquipped" Message="err_forbid_slot">Testinium Foot</Item>
+        Fixture.TestUser.Inventory.Clear();
+        Fixture.TestUser.Equipment.Clear();
+
+        var castable = GetCastable("TestForbidSlot");
+
+        // Test requirement missing
+        GiveEquipment("Testinium Foot");
+        Assert.False(Fixture.TestUser.UseCastable(castable));
+        Assert.Equal("err_forbid_slot", Fixture.TestUser.LastSystemMessage);
+        Fixture.TestUser.Equipment.Clear();
+
+        // Test requirement succeeding
+        GiveEquipment("Testinium Foot2");
+        Assert.True(Fixture.TestUser.UseCastable(castable));
+        GiveEquipment("Testinium Claw");
+        Assert.True(Fixture.TestUser.UseCastable(castable));
     }
 
     [Fact]
@@ -491,7 +503,5 @@ public void TestForbidWeapon()
         Fixture.TestUser.Equipment.Clear();
         GiveEquipment("Smol Sword");
         Assert.True(Fixture.TestUser.UseCastable(castable));
-
     }
-
 }