mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-20 04:42:18 +02:00
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.
This commit is contained in:
parent
fd7c23b200
commit
d39d5f3712
4
.github/workflows/main.yml
vendored
4
.github/workflows/main.yml
vendored
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user