From c718d8d803df2b2b90d6e5210a5087a225797c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20L?= <contact@slepin.fr>
Date: Mon, 30 Jul 2018 18:57:24 +0200
Subject: [PATCH] general: version bump + minor CI fixes

---
 CI/generate-docs.sh            | 2 +-
 CI/macos/obs-websocket.pkgproj | 2 +-
 appveyor.yml                   | 2 +-
 installer/installer.iss        | 4 ++--
 src/obs-websocket.h            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CI/generate-docs.sh b/CI/generate-docs.sh
index 2afdaacb..4bcba4c3 100755
--- a/CI/generate-docs.sh
+++ b/CI/generate-docs.sh
@@ -15,7 +15,7 @@ if git diff --quiet; then
     exit 0
 fi
 
-if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then
+if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" -o "$TRAVIS_BRANCH" != "4.3-maintenance" ]; then
     echo "-- Skipping documentation deployment because this is either a pull request or a non-master branch."
     exit 0
 fi
diff --git a/CI/macos/obs-websocket.pkgproj b/CI/macos/obs-websocket.pkgproj
index eaa9e364..d853f5cc 100644
--- a/CI/macos/obs-websocket.pkgproj
+++ b/CI/macos/obs-websocket.pkgproj
@@ -635,7 +635,7 @@
 			<key>OVERWRITE_PERMISSIONS</key>
 			<false/>
 			<key>VERSION</key>
-			<string>4.3.3</string>
+			<string>4.4.0</string>
 		</dict>
 		<key>PROJECT_COMMENTS</key>
 		<dict>
diff --git a/appveyor.yml b/appveyor.yml
index 4e3c1888..21ddba9f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,7 +32,7 @@ before_deploy:
 
 deploy_script:
   - ps: Push-AppveyorArtifact "C:\projects\obs-websocket\build.zip" -FileName "obs-websocket-$(git log --pretty=format:'%h' -n 1)-Windows.zip"
-  - ps: Push-AppveyorArtifact "C:\projects\obs-websocket\installer\Output\obs-websocket-git-Windows-Installer.exe" -FileName "obs-websocket-$(git log --pretty=format:'%h' -n 1)-Windows-Installer.exe"
+  - ps: Push-AppveyorArtifact "C:\projects\obs-websocket\installer\Output\obs-websocket-Windows-Installer.exe" -FileName "obs-websocket-$(git log --pretty=format:'%h' -n 1)-Windows-Installer.exe"
 
 test: off
 
diff --git a/installer/installer.iss b/installer/installer.iss
index 55d1d0a7..c42af50f 100644
--- a/installer/installer.iss
+++ b/installer/installer.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "obs-websocket"
-#define MyAppVersion "git"
+#define MyAppVersion "4.4.0"
 #define MyAppPublisher "Stephane Lepin"
 #define MyAppURL "http://github.com/Palakis/obs-websocket"
 
@@ -20,7 +20,7 @@ AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={code:GetDirName}
 DefaultGroupName={#MyAppName}
-OutputBaseFilename=obs-websocket-{#MyAppVersion}-Windows-Installer
+OutputBaseFilename=obs-websocket-Windows-Installer
 Compression=lzma
 SolidCompression=yes
 LicenseFile=..\LICENSE
diff --git a/src/obs-websocket.h b/src/obs-websocket.h
index ce60cc01..1ff931f6 100644
--- a/src/obs-websocket.h
+++ b/src/obs-websocket.h
@@ -39,7 +39,7 @@ using OBSOutputAutoRelease =
 	OBSRef<obs_output_t*, ___output_dummy_addref, obs_output_release>;
 
 #define PROP_AUTHENTICATED "wsclient_authenticated"
-#define OBS_WEBSOCKET_VERSION "4.3.3"
+#define OBS_WEBSOCKET_VERSION "4.4.0"
 
 #define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__)