From d39d5f3712358e71800f2f2addeac88402676c50 Mon Sep 17 00:00:00 2001
From: Ryan Foster <ryan@obsproject.com>
Date: Mon, 1 Aug 2022 21:07:14 -0400
Subject: [PATCH] CI: Fix packaging scripts

On CI, do not fetch tags in packaging scripts. For some reason, the
checkout action seems to locally update any new git tags on the runner:

t [tag update]   (commit-hash) -> tag-name

This causes future calls to fetch git tags to fail on CI with:

! [rejected]   tag-name -> tag-name  (would clobber existing tag)

To avoid this, we can simply not fetch tags a second time on CI.

Additionally, fix the Windows Installer job.
---
 .github/workflows/main.yml    | 4 ++--
 CI/linux/03_package_obs.sh    | 6 ++++--
 CI/macos/03_package_obs.sh    | 6 ++++--
 CI/windows/03_package_obs.ps1 | 6 ++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 981c2e5a8..49066960d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -440,8 +440,8 @@ jobs:
             $null = New-Item -ItemType Directory -Force -Path install_temp
           }
 
-          Expand-Archive -Path "$(Get-ChildItem -filter "obs-studio-windows-*-x86.zip" -File)" -DestinationPath install_temp
-          Expand-Archive -Path "$(Get-ChildItem -filter "obs-studio-windows-*-x64.zip" -File)" -Force -DestinationPath install_temp
+          Expand-Archive -Path "$(Get-ChildItem -filter "obs-studio-*-windows-x86.zip" -File)" -DestinationPath install_temp
+          Expand-Archive -Path "$(Get-ChildItem -filter "obs-studio-*-windows-x64.zip" -File)" -Force -DestinationPath install_temp
 
           CI/windows/03_package_obs.ps1 -CombinedArchs -Package
 
diff --git a/CI/linux/03_package_obs.sh b/CI/linux/03_package_obs.sh
index 6d4b2324c..55ef71451 100755
--- a/CI/linux/03_package_obs.sh
+++ b/CI/linux/03_package_obs.sh
@@ -37,8 +37,10 @@ package-obs-standalone() {
     source "${CHECKOUT_DIR}/CI/include/build_support.sh"
     source "${CHECKOUT_DIR}/CI/include/build_support_linux.sh"
 
-    step "Fetch OBS tags..."
-    git fetch origin --tags
+    if [ -z "${CI}" ]; then
+        step "Fetch OBS tags..."
+        git fetch --tags origin
+    fi
 
     GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
     GIT_HASH=$(git rev-parse --short=9 HEAD)
diff --git a/CI/macos/03_package_obs.sh b/CI/macos/03_package_obs.sh
index 80600ace0..47582ec90 100755
--- a/CI/macos/03_package_obs.sh
+++ b/CI/macos/03_package_obs.sh
@@ -99,8 +99,10 @@ package-obs-standalone() {
     check_archs
     check_macos_version
 
-    step "Fetch OBS tags..."
-    /usr/bin/git fetch origin --tags
+    if [ -z "${CI}" ]; then
+        step "Fetch OBS tags..."
+        /usr/bin/git fetch --tags origin
+    fi
 
     GIT_BRANCH=$(/usr/bin/git rev-parse --abbrev-ref HEAD)
     GIT_HASH=$(/usr/bin/git rev-parse --short=9 HEAD)
diff --git a/CI/windows/03_package_obs.ps1 b/CI/windows/03_package_obs.ps1
index 067f9a41a..6801aef88 100644
--- a/CI/windows/03_package_obs.ps1
+++ b/CI/windows/03_package_obs.ps1
@@ -107,8 +107,10 @@ function Package-OBS-Standalone {
 
     . ${CheckoutDir}/CI/include/build_support_windows.ps1
 
-    Write-Step "Fetch OBS tags..."
-    $null = git fetch origin --tags
+    if (!(Test-Path Env:CI)) {
+        Write-Step "Fetch OBS tags..."
+        $null = git fetch --tags origin
+    }
 
     Ensure-Directory ${CheckoutDir}
     $GitBranch = git rev-parse --abbrev-ref HEAD