Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(CI): Fix CI #51

Merged
merged 2 commits into from Nov 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions CI/checkout-cmake-obs-windows.cmd
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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."
Expand Down
1 change: 1 addition & 0 deletions CI/install-dependencies-macos.sh
Expand Up @@ -21,6 +21,7 @@ echo "[obs-ssp] Updating Homebrew.."
brew update >/dev/null

echo "[obs-ssp] Checking installed Homebrew formulas.."
export HOMEBREW_NO_AUTO_UPDATE=1
BREW_PACKAGES=$(brew list)
BREW_DEPENDENCIES="jack speexdsp ccache swig mbedtls"

Expand Down
4 changes: 2 additions & 2 deletions 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."
)
Expand Down
1 change: 0 additions & 1 deletion CI/package-macos.sh
Expand Up @@ -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}')
Expand Down
7 changes: 4 additions & 3 deletions azure-pipelines.yml
Expand Up @@ -22,9 +22,10 @@ jobs:
DepsPath32: '$(DepsBasePath)\win32'
DepsPath64: '$(DepsBasePath)\win64'
QtBaseDir: 'D:\QtDep'
QTDIR32: '$(QtBaseDir)\5.10.1\msvc2017'
QTDIR64: '$(QtBaseDir)\5.10.1\msvc2017_64'
QTDIR32: '$(QtBaseDir)\5.15.2\msvc2019'
QTDIR64: '$(QtBaseDir)\5.15.2\msvc2019_64'
OBSPath: 'D:\obs-studio'
OBSTargetVersion: '26.1.0'
steps:
- checkout: self
submodules: true
Expand Down Expand Up @@ -94,7 +95,7 @@ jobs:

- job: 'Build_macOS'
pool:
vmImage: 'macos-10.14'
vmImage: 'macos-10.15'
steps:
- checkout: self
submodules: true
Expand Down