From 98013a10b178356a3011110cc484989c9732070d Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Fri, 10 Jan 2020 10:00:57 +0800 Subject: [PATCH] (*)don't cache qt installation on github actions since it's not stable enough --- .github/workflows/macos.yml | 16 ---------------- .github/workflows/windows.yml | 18 ------------------ 2 files changed, 34 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b5c9129..e3e56b7 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -20,23 +20,7 @@ jobs: env: targetName: "Cisco Jabber Log Viewer" steps: - - name: cacheQt - id: MacosCacheQt - uses: actions/cache@v1 - with: - path: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} - key: ${{ runner.os }}-Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} - - name: setupQt - if: steps.MacosCacheQt.outputs.cache-hit == 'true' - shell: pwsh - env: - QtPath: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} - run: | - $qt_Path=${env:QtPath} - echo "::set-env name=Qt5_Dir::$qt_Path" - echo "::add-path::$qt_Path/bin" - name: Install Qt - if: steps.MacosCacheQt.outputs.cache-hit != 'true' uses: jurplel/install-qt-action@v2.0.0 with: version: ${{ matrix.qt_ver }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3ff9d1b..f023439 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -37,25 +37,7 @@ jobs: targetName: CJLV.exe # 步骤 steps: - - name: cacheQt - id: WindowsCacheQt - uses: actions/cache@v1 - with: - path: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch_install}} - key: ${{ runner.os }}-Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} - - name: setupQt - if: steps.WindowsCacheQt.outputs.cache-hit == 'true' - shell: pwsh - env: - QtPath: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch_install}} - run: | - $qt_Path=${env:QtPath} - echo "::set-env name=Qt5_Dir::$qt_Path" - echo "::add-path::$qt_Path/bin" - # 安装Qt - name: Install Qt - if: steps.WindowsCacheQt.outputs.cache-hit != 'true' - # 使用外部action。这个action专门用来安装Qt uses: jurplel/install-qt-action@v2.0.0 with: # Version of Qt to install