v1.6-5 Linux系统架构获取修复 | 更改workflow

HikariRevivalProject · Oct 13, 2024 · eed6126 · eed6126
1 parent 10ef949
commit eed6126
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-20.04, windows-latest]
 
     runs-on: ${{ matrix.os }}
 
@@ -32,6 +32,7 @@ jobs:
           nuitka-version: main
           script-name: main.py
           onefile: true
+          python-debug: true
           mingw64: true
           windows-icon-from-ico: HSL.ico
           company-name: HikariRevivalProject

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu:latest
+MAINTAINER Hikari<[email protected]>
+VOLUME /opt/HikariServerLauncher
+WORKDIR /
+RUN apt-get update
+ADD main.bin /data/main.bin
+EXPOSE 25565
+ENV PYTHONIOENCODING=utf-8
+CMD ["/data/main.bin"]
diff --git a/hsl.json b/hsl.json
@@ -1,4 +1,4 @@
 {
     "version": 16,
-    "minor": 4
+    "minor": 5
 }
diff --git a/hsl/core/checks.py b/hsl/core/checks.py
@@ -8,7 +8,7 @@
 SPCONFIGS_SOURCE = r'https://hsl.hikari.bond/spconfigs.json'
 VERSION_SOURCE = r'https://hsl.hikari.bond/hsl.json'
 HSL_VERSION = 16
-HSL_VERSION_MINOR = 4
+HSL_VERSION_MINOR = 5
 
 console = Console()
 async def make_request(url: str, error_message: str) -> dict:

diff --git a/hsl/core/main.py b/hsl/core/main.py
@@ -8,7 +8,7 @@
 console = Console()
 
 OS_ARCH = platform.machine()
-if OS_ARCH != 'AMD64':
+if OS_ARCH not in ['AMD64', 'x86_64']:
     console.print(f'当前系统架构{OS_ARCH}不支持，请使用AMD64架构的设备/系统运行.')
     sys.exit(1)
 with console.status('[bold purple]正在启动 Hikari Server Launcher...',spinner='material'):