From eed61262fafcd91fc3eb49d80f3e11dabfda4ce7 Mon Sep 17 00:00:00 2001
From: Hikari <wdh16665@gmail.com>
Date: Sun, 13 Oct 2024 10:24:53 +0800
Subject: [PATCH] =?UTF-8?q?v1.6-5=20Linux=E7=B3=BB=E7=BB=9F=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84=E8=8E=B7=E5=8F=96=E4=BF=AE=E5=A4=8D=20|=20=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9workflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 3 ++-
 Dockerfile                  | 9 +++++++++
 hsl.json                    | 2 +-
 hsl/core/checks.py          | 2 +-
 hsl/core/main.py            | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 Dockerfile

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f6a6534..eaf7435 100644
--- 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
new file mode 100644
index 0000000..7452ed9
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu:latest
+MAINTAINER Hikari<contact@hikari.bond>
+VOLUME /opt/HikariServerLauncher
+WORKDIR /
+RUN apt-get update
+ADD main.bin /data/main.bin
+EXPOSE 25565
+ENV PYTHONIOENCODING=utf-8
+CMD ["/data/main.bin"]
\ No newline at end of file
diff --git a/hsl.json b/hsl.json
index 921c885..e257346 100644
--- a/hsl.json
+++ b/hsl.json
@@ -1,4 +1,4 @@
 {
     "version": 16,
-    "minor": 4
+    "minor": 5
 }
\ No newline at end of file
diff --git a/hsl/core/checks.py b/hsl/core/checks.py
index f949bed..aafb7cb 100644
--- 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
index 7c477e1..3f65e1a 100644
--- 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'):