diff options
| author | 2019-09-22 18:14:08 -0600 | |
|---|---|---|
| committer | 2019-09-22 18:14:08 -0600 | |
| commit | 2f5545f8de907d1e58b65d4f75b4403628d6a136 (patch) | |
| tree | 27fcf6c5f21e1c28ef0887b1ca68cce4bbd770aa | |
| parent | ci: Split mainline pipeline and add support for GitHub releases (#2900) (diff) | |
| parent | ci: Correct GitHub Release name (diff) | |
| download | yuzu-2f5545f8de907d1e58b65d4f75b4403628d6a136.tar.gz yuzu-2f5545f8de907d1e58b65d4f75b4403628d6a136.tar.xz yuzu-2f5545f8de907d1e58b65d4f75b4403628d6a136.zip | |
Merge pull request #2901 from DarkLordZach/mainline-title-bar
ci: Properly parse Azure CI details in title bar
| -rw-r--r-- | .ci/templates/build-single.yml | 2 | ||||
| -rw-r--r-- | src/common/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/.ci/templates/build-single.yml b/.ci/templates/build-single.yml index cd9d1df88..9bc27247e 100644 --- a/.ci/templates/build-single.yml +++ b/.ci/templates/build-single.yml | |||
| @@ -3,6 +3,8 @@ parameters: | |||
| 3 | cache: 'false' | 3 | cache: 'false' |
| 4 | 4 | ||
| 5 | steps: | 5 | steps: |
| 6 | - script: export DATE=`date '+%Y.%m.%d'` && export CI=true && AZURE_REPO_NAME=yuzu-emu/yuzu-$(BuildName) && AZURE_REPO_TAG=$(BuildName)-$DATE | ||
| 7 | displayName: 'Determine Build Name' | ||
| 6 | - task: DockerInstaller@0 | 8 | - task: DockerInstaller@0 |
| 7 | displayName: 'Prepare Environment' | 9 | displayName: 'Prepare Environment' |
| 8 | inputs: | 10 | inputs: |
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 01abdb3bb..dfed8b51d 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -10,6 +10,9 @@ if (DEFINED ENV{CI}) | |||
| 10 | elseif(DEFINED ENV{APPVEYOR}) | 10 | elseif(DEFINED ENV{APPVEYOR}) |
| 11 | set(BUILD_REPOSITORY $ENV{APPVEYOR_REPO_NAME}) | 11 | set(BUILD_REPOSITORY $ENV{APPVEYOR_REPO_NAME}) |
| 12 | set(BUILD_TAG $ENV{APPVEYOR_REPO_TAG_NAME}) | 12 | set(BUILD_TAG $ENV{APPVEYOR_REPO_TAG_NAME}) |
| 13 | elseif(DEFINED ENV{AZURE}) | ||
| 14 | set(BUILD_REPOSITORY $ENV{AZURE_REPO_NAME}) | ||
| 15 | set(BUILD_TAG $ENV{AZURE_REPO_TAG}) | ||
| 13 | endif() | 16 | endif() |
| 14 | endif() | 17 | endif() |
| 15 | add_custom_command(OUTPUT scm_rev.cpp | 18 | add_custom_command(OUTPUT scm_rev.cpp |