CI: macos 10.15.7

northsea4 · Feb 22, 2024 · 96d175e · 96d175e
1 parent 2debacc
commit 96d175e
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,17 +33,14 @@ jobs:
 
           # https://docs.github.com/zh/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners
           # 如果设置了 vars `SELF_HOSTED_MACOS_ARM64_RUNNER`，则添加self-hosted runner到矩阵
-          SELF_HOSTED_MACOS_ARM64_RUNNER=${{ vars.SELF_HOSTED_MACOS_ARM64_RUNNER }}}
-          if [[ -n "$SELF_HOSTED_MACOS_ARM64_RUNNER" ]]; then
+          if [[ -n "${{ vars.SELF_HOSTED_MACOS_ARM64_RUNNER }}" ]]; then
             # setup-python没有aarch64的python3.9，这里指定python3.10
             items+=('{"build":"macos", "os": ["self-hosted", "macOS", "ARM64"], "arch": "aarch64", "python": "3.10", "cache": "none"}')
           fi
 
           # 测试构建：macOS 10.15.7, x86_64, 指定opencv版本
-          BUILD_FOR_MACOS_10_15_7=${{ vars.BUILD_FOR_MACOS_10_15_7 }}
-          MACOS_10_15_7_CV_VERSION=${{ vars.MACOS_10_15_7_CV_VERSION }}
-          if [[ -n "$BUILD_FOR_MACOS_10_15_7" && -n "$MACOS_10_15_7_CV_VERSION" ]]; then
-            items+=('{"build": "macos", "os": "macos-latest", "arch": "x86_64", "cv": "$MACOS_10_15_7_CV_VERSION", "tail": "-cv$MACOS_10_15_7_CV_VERSION"}')
+          if [[ -n "${{ vars.BUILD_FOR_MACOS_10_15_7 }}" && -n "${{ vars.MACOS_10_15_7_CV_VERSION }}" ]]; then
+            items+=('{"build": "macos", "os": "macos-latest", "arch": "x86_64", "cv": "${{ vars.MACOS_10_15_7_CV_VERSION }}", "tail": "-cv${{ vars.MACOS_10_15_7_CV_VERSION }}"}')
           fi
           
           # 合并items到json数组