RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

Actually fix build id issue

Browse Source
This commit is contained in:
Zion Nimchuk 2023-09-01 23:09:29 -07:00 committed by Megamouse
parent 7e281a3354
commit d4b1d5c938
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Utilities/git-version-gen.cmd
View File

@ -91,7 +91,7 @@ for /F %%I IN ('call %GIT% rev-list HEAD --count') do set COMMIT_COUNT=%%I
rem // Check if the current build system sets the git branch and version.
rem // The name is misleading. This is also used for master builds.
if defined SYSTEM_PULLREQUEST_SOURCEBRANCH (
if defined BUILD_SOURCEBRANCHNAME (
rem // This must be a CI build
@ -125,6 +125,7 @@ if defined SYSTEM_PULLREQUEST_SOURCEBRANCH (
for /F %%I IN ('call %GIT% rev-parse --short^=8 HEAD') do set GIT_VERSION=%COMMIT_COUNT%-%%I
for /F %%I IN ('call %GIT% rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%I
set GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%
) else (
rem // This must be a pull request or a build from a fork.
echo Assuming pull request build

6
azure-pipelines.yml
View File

@ -9,12 +9,6 @@ pr:
branches:
include:
- master
variables:
BUILD_REPOSITORY_NAME: $(Build.Repository.Name)
SYSTEM_PULLREQUEST_SOURCEBRANCH: $(System.PullRequest.SourceBranch)
SYSTEM_PULLREQUEST_PULLREQUESTID: $(System.PullRequest.PullRequestId)
BUILD_SOURCEVERSION: $(Build.SourceVersion)
BUILD_SOURCEBRANCHNAME: $(Build.SourceBranchName)
jobs:
- job: Linux_Build
strategy: