Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2025-02-12 11:02:43 +08:00
commit 68f929baac
3 changed files with 4 additions and 4 deletions

View file

@ -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"

View file

@ -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

View file

@ -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