From 14248685afca9bb3fe0a11ed0b0586f6120a85c7 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sun, 22 Sep 2019 17:22:08 -0400 Subject: cmake: Add SCM detection for Azure --- src/common/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) 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}) elseif(DEFINED ENV{APPVEYOR}) set(BUILD_REPOSITORY $ENV{APPVEYOR_REPO_NAME}) set(BUILD_TAG $ENV{APPVEYOR_REPO_TAG_NAME}) + elseif(DEFINED ENV{AZURE}) + set(BUILD_REPOSITORY $ENV{AZURE_REPO_NAME}) + set(BUILD_TAG $ENV{AZURE_REPO_TAG}) endif() endif() add_custom_command(OUTPUT scm_rev.cpp -- cgit v1.2.3 From 851c5d67ae21d2a985f19a6bdb46282fed4f95c5 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sun, 22 Sep 2019 17:23:47 -0400 Subject: ci: Update to use date as build number --- .ci/templates/build-single.yml | 1 + .ci/templates/release-github.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/templates/build-single.yml b/.ci/templates/build-single.yml index cd9d1df88..44b709177 100644 --- a/.ci/templates/build-single.yml +++ b/.ci/templates/build-single.yml @@ -3,6 +3,7 @@ parameters: cache: 'false' steps: +- script: export CI=true && AZURE_REPO_NAME=yuzu-emu/yuzu-$(BuildName) && AZURE_REPO_TAG=$(BuildName)-$(Date:yyyy.MM.dd) - task: DockerInstaller@0 displayName: 'Prepare Environment' inputs: diff --git a/.ci/templates/release-github.yml b/.ci/templates/release-github.yml index 39fd47f1c..92913f30b 100644 --- a/.ci/templates/release-github.yml +++ b/.ci/templates/release-github.yml @@ -3,7 +3,7 @@ steps: - task: GitHubRelease@0 inputs: action: 'create' - title: 'yuzu $(BuildName) #$(Build.BuildId)' + title: 'yuzu $(BuildName) $(Date:yyyy.MM.dd)' assets: '$(Build.ArtifactStagingDirectory)/*' gitHubConnection: $(GitHubReleaseConnectionName) repositoryName: '$(Build.Repository.Name)' -- cgit v1.2.3 From 15805f4e0184ede370bdc63d533fc5e0be6a6a50 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sun, 22 Sep 2019 18:39:03 -0400 Subject: ci: Determine build date via bash --- .ci/templates/build-single.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/templates/build-single.yml b/.ci/templates/build-single.yml index 44b709177..9bc27247e 100644 --- a/.ci/templates/build-single.yml +++ b/.ci/templates/build-single.yml @@ -3,7 +3,8 @@ parameters: cache: 'false' steps: -- script: export CI=true && AZURE_REPO_NAME=yuzu-emu/yuzu-$(BuildName) && AZURE_REPO_TAG=$(BuildName)-$(Date:yyyy.MM.dd) +- script: export DATE=`date '+%Y.%m.%d'` && export CI=true && AZURE_REPO_NAME=yuzu-emu/yuzu-$(BuildName) && AZURE_REPO_TAG=$(BuildName)-$DATE + displayName: 'Determine Build Name' - task: DockerInstaller@0 displayName: 'Prepare Environment' inputs: -- cgit v1.2.3 From 921dae5e831e015fb3dc947983c5333feeb75dcb Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sun, 22 Sep 2019 19:06:48 -0400 Subject: ci: Correct GitHub Release name --- .ci/templates/release-github.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/templates/release-github.yml b/.ci/templates/release-github.yml index 92913f30b..39fd47f1c 100644 --- a/.ci/templates/release-github.yml +++ b/.ci/templates/release-github.yml @@ -3,7 +3,7 @@ steps: - task: GitHubRelease@0 inputs: action: 'create' - title: 'yuzu $(BuildName) $(Date:yyyy.MM.dd)' + title: 'yuzu $(BuildName) #$(Build.BuildId)' assets: '$(Build.ArtifactStagingDirectory)/*' gitHubConnection: $(GitHubReleaseConnectionName) repositoryName: '$(Build.Repository.Name)' -- cgit v1.2.3