Test

jdpurcell · Dec 13, 2024 · 2b45e06 · 2b45e06
1 parent c340bb8
commit 2b45e06
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/test-android.yml b/.github/workflows/test-android.yml
@@ -57,9 +57,9 @@ jobs:
         if: ${{ startsWith(matrix.qt.version, '6.') }}
         shell: pwsh
         run: |
-          $qtRootDir = [string](Resolve-Path -Path $env:QT_ROOT_DIR)
-          $qtHostPath = [string](Resolve-Path -Path $env:QT_HOST_PATH)
-          if ($qtHostPath -ne [string](Resolve-Path -Path (qmake -query QT_HOST_PREFIX))) {
+          $qtRootDir = $env:QT_ROOT_DIR
+          $qtHostPath = $env:QT_HOST_PATH
+          if ($qtHostPath -ne (qmake -query QT_HOST_PREFIX)) {
             throw "QT_HOST_PATH should match qmake's QT_HOST_PREFIX."
           }
           if ($qtRootDir -eq $qtHostPath) {

diff --git a/action/lib/main.js b/action/lib/main.js
@@ -439,7 +439,7 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
                     .then((data) => { var _a, _b; return (_b = (_a = data.match(/^HostPrefix=(.*)$/m)) === null || _a === void 0 ? void 0 : _a[1].trim()) !== null && _b !== void 0 ? _b : ""; })
                     .catch(() => "");
                 if (hostPrefix) {
-                    core.exportVariable("QT_HOST_PATHH", path.resolve(qtPath, "bin", hostPrefix));
+                    core.exportVariable("QT_HOST_PATH", path.resolve(qtPath, "bin", hostPrefix));
                 }
             }
             core.addPath(path.resolve(qtPath, "bin"));

diff --git a/action/src/main.ts b/action/src/main.ts
@@ -482,7 +482,7 @@ const run = async (): Promise<void> => {
           .then((data) => data.match(/^HostPrefix=(.*)$/m)?.[1].trim() ?? "")
           .catch(() => "");
         if (hostPrefix) {
-          core.exportVariable("QT_HOST_PATHH", path.resolve(qtPath, "bin", hostPrefix));
+          core.exportVariable("QT_HOST_PATH", path.resolve(qtPath, "bin", hostPrefix));
         }
       }
       core.addPath(path.resolve(qtPath, "bin"));