From 90386bb81bfd0ff9a1f2299084fae4173331f991 Mon Sep 17 00:00:00 2001
From: tt2468 <tt2468@gmail.com>
Date: Wed, 28 Apr 2021 17:02:11 -0700
Subject: [PATCH] CI: Match cache stuff

---
 .github/workflows/main.yml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 29495add..7531d3a6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,15 +20,16 @@ jobs:
     if: contains(github.event.head_commit.message, '[skip ci]') != true
     env:
       build_config: 'RelWithDebInfo'
-      DEPS_CACHE_VERSION: '2' # Change whenever updating OBS dependencies URL, in order to force a cache reset
-      DEPS_BASE_PATH: 'D:\obsdependencies'
+      DEPS_CACHE_VERSION: '1' # Change whenever updating OBS dependencies URL, in order to force a cache reset
+      DEPS_BASE_PATH: '${{ github.workspace }}\obsdependencies'
       DEPS_PATH_32: '${DEPS_BASE_PATH}\win32'
       DEPS_PATH_64: '${DEPS_BASE_PATH}\win64'
-      QT_CACHE_VERSION: '2' # Change whenever updating Qt dependency URL, in order to force a cache reset
-      QT_BASE_DIR: 'D:\QtDep'
+      QT_CACHE_VERSION: '1' # Change whenever updating Qt dependency URL, in order to force a cache reset
+      QT_ARCHIVE_FILE: 'Qt_5.15.2.7z'
+      QT_BASE_DIR: '${{ github.workspace }}\QtDep'
       QTDIR32: '${QT_BASE_DIR}\5.15.2\msvc2019'
       QTDIR64: '${QT_BASE_DIR}\5.15.2\msvc2019_64'
-      OBS_PATH: 'D:\obs-studio'
+      OBS_PATH: '${{ github.workspace }}\obs-studio'
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2
@@ -36,13 +37,20 @@ jobs:
           path: ${{ github.workspace }}/obs-websocket
           submodules: 'recursive'
       - name: 'Restore cached Qt archive file'
+        id: qtcache
         uses: actions/cache@v2
         with:
-          path: ${QT_BASE_DIR}
-          key: 'qtdep-"${{ env.QT_CACHE_VERSION }}" | "${{ runner.os }}"'
+          path: ${QT_BASE_DIR}\${QT_ARCHIVE_FILE}
+          key: 'qtdep-${{ env.QT_CACHE_VERSION }} | ${{ runner.os }}'
           restore-keys: |
-            qtdep-"${{ env.QT_CACHE_VERSION }}" | "${{ runner.os }}"
+            qtdep-${{ env.QT_CACHE_VERSION }} | ${{ runner.os }}
       - name: 'Download Qt'
-        working-directory: ${{ github.workspace }}/obs-websocket
+        if: steps.cache.outputs.cache-hit != 'true'
+        working-directory: ${QT_BASE_DIR}
         run: |
-          ./CI/windows/install-qt-win.cmd
\ No newline at end of file
+          curl -kLO https://tt2468.net/dl/${{ env.QT_ARCHIVE_FILE }} -f --retry 5 -C -
+      - name: 'Extract Qt'
+        working-directory: ${QT_BASE_DIR}
+        run: |
+          7z x ${{ env.QT_ARCHIVE_FILE }} -o%QT_BASE_DIR%
+          dir %QT_BASE_DIR%
\ No newline at end of file