Merge pull request #91 from BaseMC/develop

Release
BaseMC · Sep 1, 2024 · 6437063 · 6437063
2 parents 1b0aefa + 2ec6032
commit 6437063
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml
@@ -52,7 +52,7 @@ jobs:
     needs: [build_base]
     strategy:
       matrix:
-        os: [win-x64, linux-x64]
+        os: [win-x64, linux-x64, linux-arm64]
         configuration: [Release]
         project: [Aves]
 

diff --git a/src/ADB/Java/ApiArch.cs b/src/ADB/Java/ApiArch.cs
@@ -8,8 +8,7 @@ namespace ADB.Java
    public class ApiArch
    {
       public static readonly ApiArch X64 = new ApiArch("x64", s => "x64".Equals(s));
-      public static readonly ApiArch X86 = new ApiArch("x86", s => "x86".Equals(s));
-      public static readonly ApiArch ARM = new ApiArch("arm", s => "arm".Equals(s) || "arm64".Equals(s));
+      public static readonly ApiArch AARCH64 = new ApiArch("aarch64", s => "arm".Equals(s) || "arm64".Equals(s));
 
       public string ApiPar { get; private set; }
 

diff --git a/src/ADB/Java/JavaTask.cs b/src/ADB/Java/JavaTask.cs
@@ -66,8 +66,7 @@ private void DetermineOsAndArchFromRID()
 
          Config.Architecture = new ApiArch[] {
             ApiArch.X64,
-            ApiArch.X86,
-            ApiArch.ARM
+            ApiArch.AARCH64
          }.FirstOrDefault(os => os.Matcher.Invoke(ridArch))?.ApiPar;
 
          Log.Info($"RID='{rid}' -> OS='{Config.OS}'; Arch='{Config.Architecture}'");