From f2270f7e171574705ff667f850b1b71cd8d96562 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 11 Feb 2025 22:10:54 +0800 Subject: [PATCH 1/2] :art: Improve harmony kernel build script --- kernel/harmony/build-win.sh | 2 +- kernel/harmony/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/harmony/build-win.sh b/kernel/harmony/build-win.sh index 4e347f769..d8846b954 100755 --- a/kernel/harmony/build-win.sh +++ b/kernel/harmony/build-win.sh @@ -1,6 +1,6 @@ #!/bin/bash -export OHOS_NDK_HOME=/mnt/f/ohos-sdk-windows_linux-public/linux/ +export OHOS_NDK_HOME=/mnt/f/ohos-sdk-windows_linux-public/linux export LOG_ADAPTOR_HOME=/mnt/f/log-adaptor export CC=$OHOS_NDK_HOME/native/llvm/bin/clang diff --git a/kernel/harmony/build.sh b/kernel/harmony/build.sh index 3f84fdf59..e9edc2f1d 100755 --- a/kernel/harmony/build.sh +++ b/kernel/harmony/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -export OHOS_NDK_HOME=/mnt/f/ohos-sdk-windows_linux-public/linux/ +export OHOS_NDK_HOME=/mnt/f/ohos-sdk-windows_linux-public/linux export LOG_ADAPTOR_HOME=/mnt/f/log-adaptor export CC=$OHOS_NDK_HOME/native/llvm/bin/clang From f702bba058bd41b79506a4cf17ec0f621a316528 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 12 Feb 2025 10:11:16 +0800 Subject: [PATCH 2/2] :art: Upgrade Ubuntu for CD action (dev version) https://github.com/siyuan-note/siyuan/issues/14059 --- .github/workflows/cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 06990fe97..b0f8c1c44 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -92,7 +92,7 @@ jobs: strategy: matrix: config: - - os: ubuntu-20.04 + - os: ubuntu-22.04 name: ubuntu build linux.AppImage kernel_path: "../app/kernel-linux/SiYuan-Kernel" build_args_prefix: "-s -w -X" @@ -101,7 +101,7 @@ jobs: goos: "linux" goarch: "amd64" suffix: "linux.AppImage" - - os: ubuntu-20.04 + - os: ubuntu-22.04 name: ubuntu build linux.tar.gz kernel_path: "../app/kernel-linux/SiYuan-Kernel" build_args_prefix: "-s -w -X"