Update azure-pipelines.yml

summershrimp · Nov 6, 2021 · c46427d · c46427d
1 parent 5056186
commit c46427d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/CI/checkout-cmake-obs-windows.cmd b/CI/checkout-cmake-obs-windows.cmd
@@ -33,6 +33,9 @@ if exist %OBSPath% (
 	set /p OBSLatestTagPrePull=<"%OBSPath%\latest-obs-studio-tag-pre-pull.txt"
 	git checkout master
 	git pull
+	if defined OBSTargetVersion (
+		git checkout %OBSTargetVersion%
+	)
 	git describe --tags --abbrev=0 --exclude="*-rc*" > "%OBSPath%\latest-obs-studio-tag-post-pull.txt"
 	set /p OBSLatestTagPostPull=<"%OBSPath%\latest-obs-studio-tag-post-pull.txt"
 	set /p OBSLatestTag=<"%OBSPath%\latest-obs-studio-tag-post-pull.txt"
@@ -62,6 +65,9 @@ if not exist %OBSPath% (
 	echo obs-studio directory does not exist
 	git clone https://github.com/obsproject/obs-studio %OBSPath%
 	cd /D %OBSPath%\
+	if defined OBSTargetVersion (
+		git checkout %OBSTargetVersion%
+	)
 	git describe --tags --abbrev=0 --exclude="*-rc*" > "%OBSPath%\obs-studio-latest-tag.txt"
 	set /p OBSLatestTag=<"%OBSPath%\obs-studio-latest-tag.txt"
 	set BuildOBS=true

diff --git a/CI/download-obs-deps.cmd b/CI/download-obs-deps.cmd
@@ -1,5 +1,5 @@
 if not exist %DepsBasePath% (
-    curl -o %DepsBasePath%.zip -kLO https://obsproject.com/downloads/dependencies2017.zip -f --retry 5 -C -
+    curl -o %DepsBasePath%.zip -kLO https://cdn-fastly.obsproject.com/downloads/dependencies2019.zip -f --retry 5 -C -
     7z x %DepsBasePath%.zip -o%DepsBasePath%
 ) else (
     echo "OBS dependencies are already there. Download skipped."

diff --git a/CI/install-qt-win.cmd b/CI/install-qt-win.cmd
@@ -1,6 +1,6 @@
 if not exist %QtBaseDir% (
-	curl -kLO https://cdn-fastly.obsproject.com/downloads/Qt_5.10.1.7z -f --retry 5 -z Qt_5.10.1.7z
-    7z x Qt_5.10.1.7z -o%QtBaseDir%
+	curl -kLO https://github.com/summershrimp/obs-auto-subtitle/releases/download/0.2.2/QT_5.15.2.7z -f --retry 5 -z QT_5.15.2.7z
+    7z x QT_5.15.2.7z -o%QtBaseDir%
 ) else (
 	echo "Qt is already installed. Download skipped."
 )

diff --git a/CI/package-macos.sh b/CI/package-macos.sh
@@ -12,7 +12,6 @@ if [ "${OSTYPE}" != "Darwin" ]; then
 fi
 
 echo "[obs-ssp] Preparing package build"
-export QT_CELLAR_PREFIX="$(/usr/bin/find /usr/local/Cellar/qt -d 1 | sort -t '.' -k 1,1n -k 2,2n -k 3,3n | tail -n 1)"
 
 GIT_HASH=$(git rev-parse --short HEAD)
 GIT_BRANCH_OR_TAG=$(git name-rev --name-only HEAD | awk -F/ '{print $NF}')

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,6 +25,7 @@ jobs:
     QTDIR32: '$(QtBaseDir)\5.10.1\msvc2017'
     QTDIR64: '$(QtBaseDir)\5.10.1\msvc2017_64'
     OBSPath: 'D:\obs-studio'
+    OBSTargetVersion: '26.1.0'
   steps:
     - checkout: self
       submodules: true
@@ -94,7 +95,7 @@ jobs:
 
 - job: 'Build_macOS'
   pool:
-    vmImage: 'macos-10.14'
+    vmImage: 'macos-10.15'
   steps:
     - checkout: self
       submodules: true