From 5481e0baaae55d4d78d7e269a79de18a03f58b07 Mon Sep 17 00:00:00 2001 From: iei-ljc Date: Tue, 3 Jun 2025 11:01:45 +0800 Subject: [PATCH 1/5] Update build.gradle if os is linux_aarch64 ,gcc set compiler --- build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7b745e57f..b34beafaa 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,11 @@ subprojects { } } } - gcc(Gcc) + gcc(Gcc){ + target("linux_aarch64") { + cppCompiler.executable = "/usr/bin/gcc" + } + } } } } From 7eccc86a2c1f78a4a25812501a46d29a7a88671b Mon Sep 17 00:00:00 2001 From: iei-ljc Date: Tue, 3 Jun 2025 11:03:09 +0800 Subject: [PATCH 2/5] Update build.gradle add LINUX_AARCH64 env --- openjdk/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/openjdk/build.gradle b/openjdk/build.gradle index d52e38b42..a88804d85 100644 --- a/openjdk/build.gradle +++ b/openjdk/build.gradle @@ -22,6 +22,7 @@ description = 'Tongsuo: OpenJdk' enum NativeBuildInfo { WINDOWS_X86_64("windows", "x86_64"), LINUX_X86_64("linux", "x86_64"), + LINUX_AARCH64("linux", "aarch_64"), MAC_X86_64("osx", "x86_64") { String libDir() { "build.x86" From 28cf0544ac23ba0581f68a10a728ed24c5f2f12b Mon Sep 17 00:00:00 2001 From: iei-ljc Date: Tue, 3 Jun 2025 11:04:44 +0800 Subject: [PATCH 3/5] Update ci.yml add linux-arm workflow --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 758f1979f..6ecc15ebb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-latest, macos-13, macos-14, windows-latest] + platform: [ubuntu-latest, macos-13, macos-14, windows-latest, ubuntu-24.04-arm] runs-on: ${{ matrix.platform }} timeout-minutes: 30 From dc6e1d07d6024752d0073d4951bd8ac81ce5b749 Mon Sep 17 00:00:00 2001 From: iei-ljc Date: Thu, 5 Jun 2025 11:07:43 +0800 Subject: [PATCH 4/5] Update release.yml add linux-arm env --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 90c030b40..274930ca1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,6 +43,10 @@ jobs: os: ubuntu-latest, target: linux-x86_64 }, + { + os: ubuntu-24.04-arm, + target: linux-aarch64 + }, { os: macos-13, target: darwin64-x86_64 From 8c833f7f51e686331d90f4ad33e719754187d46f Mon Sep 17 00:00:00 2001 From: iei-ljc Date: Thu, 5 Jun 2025 13:40:52 +0800 Subject: [PATCH 5/5] Update release.yml set arm64 target name --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 274930ca1..bf07480c8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: }, { os: ubuntu-24.04-arm, - target: linux-aarch64 + target: linux-arm64 }, { os: macos-13,