diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d8f73ba..f74640c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -45,16 +45,13 @@ jobs: with: fetch-depth: 1 - name: Build MacOS - env: - ENV_QT_PATH: '/Users/runner/runners/2.165.2/work/QtScrcpy/Qt/5.12.6' run: | + export ENV_QT_CLANG=$(pwd)/${{env.Qt5_Dir}} ci/mac/build_for_mac.sh release # tag 打包 - name: Package - env: - ENV_QT_PATH: '/Users/runner/runners/2.165.2/work/QtScrcpy/Qt/5.12.6' run: | - echo ${{env.Qt5_Dir}} + export ENV_QT_CLANG=$(pwd)/${{env.Qt5_Dir}} ci/mac/publish_for_mac.sh ../build # tag 查询github-Release - name: queryRelease diff --git a/ci/mac/build_for_mac.sh b/ci/mac/build_for_mac.sh index cf904ea..41ab2f6 100755 --- a/ci/mac/build_for_mac.sh +++ b/ci/mac/build_for_mac.sh @@ -7,7 +7,7 @@ echo --------------------------------------------------------------- # 从环境变量获取必要参数 # 例如 /Users/barry/Qt5.12.5/5.12.5 -echo ENV_QT_PATH $ENV_QT_PATH +echo ENV_QT_CLANG $ENV_QT_CLANG # 获取绝对路径,保证其他目录执行此脚本依然正确 { @@ -39,7 +39,7 @@ fi echo current build mode: $build_mode # 环境变量设置 -export PATH=$PATH:$ENV_QT_PATH/clang_64/bin +export PATH=$PATH:$ENV_QT_CLANG/bin echo echo diff --git a/ci/mac/publish_for_mac.sh b/ci/mac/publish_for_mac.sh index 2dbac1d..1d76173 100755 --- a/ci/mac/publish_for_mac.sh +++ b/ci/mac/publish_for_mac.sh @@ -6,7 +6,7 @@ echo --------------------------------------------------------------- # 从环境变量获取必要参数 # 例如 /Users/barry/Qt5.12.5/5.12.5 -echo ENV_QT_PATH $ENV_QT_PATH +echo ENV_QT_CLANG $ENV_QT_CLANG # 获取绝对路径,保证其他目录执行此脚本依然正确 { @@ -31,7 +31,7 @@ keymap_path=$script_path/../../keymap publish_path=$script_path/$publish_dir release_path=$script_path/../../output/mac/release -export PATH=$PATH:$ENV_QT_PATH/clang_64/bin +export PATH=$PATH:$ENV_QT_CLANG/bin if [ -d "$publish_path" ]; then rm -rf $publish_path