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.
master
Ryan Foster 2022-08-01 21:07:14 -04:00
parent fd7c23b200
commit d39d5f3712
4 changed files with 14 additions and 8 deletions

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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