summaryrefslogtreecommitdiff
path: root/.ci/templates
diff options
context:
space:
mode:
authorGravatar Zach Hilman2019-10-08 19:52:02 -0400
committerGravatar Zach Hilman2019-10-08 19:52:02 -0400
commit1817191d5569bea9b19c25f548117325eda6ed65 (patch)
treeb06f70fd243c5205e768aa9902f0993d335cdea1 /.ci/templates
parentci: Update build suffix for mock builds (diff)
downloadyuzu-1817191d5569bea9b19c25f548117325eda6ed65.tar.gz
yuzu-1817191d5569bea9b19c25f548117325eda6ed65.tar.xz
yuzu-1817191d5569bea9b19c25f548117325eda6ed65.zip
ci: Isolate upload merge step into stage 2
Diffstat (limited to '.ci/templates')
-rw-r--r--.ci/templates/merge-private.yml12
-rw-r--r--.ci/templates/merge.yml12
-rw-r--r--.ci/templates/release-github.yml6
-rw-r--r--.ci/templates/release-private-tag.yml9
4 files changed, 15 insertions, 24 deletions
diff --git a/.ci/templates/merge-private.yml b/.ci/templates/merge-private.yml
index a640cfbde..f15a74355 100644
--- a/.ci/templates/merge-private.yml
+++ b/.ci/templates/merge-private.yml
@@ -31,17 +31,7 @@ jobs:
31 needSubmodules: 'true' 31 needSubmodules: 'true'
32 - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh 32 - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
33 displayName: 'Apply Git Configuration' 33 displayName: 'Apply Git Configuration'
34 - script: git tag -a $(BuildName)-$(Build.BuildId) -m "yuzu $(BuildName) $(Build.BuildNumber) $(Build.DefinitionName)"
35 displayName: 'Tag Source'
36 - script: git remote add other $(GitRepoPushChangesURL) 34 - script: git remote add other $(GitRepoPushChangesURL)
37 displayName: 'Register Repository' 35 displayName: 'Register Repository'
38 - script: git push --follow-tags --force other HEAD:$(GitPushBranch) 36 - script: git push --force other HEAD:$(GitPushBranch)
39 displayName: 'Update Code' 37 displayName: 'Update Code'
40 - script: git rev-list -n 1 $(BuildName)-$(Build.BuildId) > $(Build.ArtifactStagingDirectory)/tag-commit.sha
41 displayName: 'Calculate Release Point'
42 - task: PublishPipelineArtifact@1
43 displayName: 'Upload Release Point'
44 inputs:
45 targetPath: '$(Build.ArtifactStagingDirectory)/tag-commit.sha'
46 artifact: 'yuzu-$(BuildName)-release-point'
47 replaceExistingArchive: true \ No newline at end of file
diff --git a/.ci/templates/merge.yml b/.ci/templates/merge.yml
index efc82778a..460dfa1c1 100644
--- a/.ci/templates/merge.yml
+++ b/.ci/templates/merge.yml
@@ -30,17 +30,7 @@ jobs:
30 needSubmodules: 'true' 30 needSubmodules: 'true'
31 - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh 31 - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
32 displayName: 'Apply Git Configuration' 32 displayName: 'Apply Git Configuration'
33 - script: git tag -a $(BuildName)-$(Build.BuildId) -m "yuzu $(BuildName) $(Build.BuildNumber) $(Build.DefinitionName)"
34 displayName: 'Tag Source'
35 - script: git remote add other $(GitRepoPushChangesURL) 33 - script: git remote add other $(GitRepoPushChangesURL)
36 displayName: 'Register Repository' 34 displayName: 'Register Repository'
37 - script: git push --follow-tags --force other HEAD:$(GitPushBranch) 35 - script: git push --force other HEAD:$(GitPushBranch)
38 displayName: 'Update Code' 36 displayName: 'Update Code'
39 - script: git rev-list -n 1 $(BuildName)-$(Build.BuildId) > $(Build.ArtifactStagingDirectory)/tag-commit.sha
40 displayName: 'Calculate Release Point'
41 - task: PublishPipelineArtifact@1
42 displayName: 'Upload Release Point'
43 inputs:
44 targetPath: '$(Build.ArtifactStagingDirectory)/tag-commit.sha'
45 artifact: 'yuzu-$(BuildName)-release-point'
46 replaceExistingArchive: true \ No newline at end of file
diff --git a/.ci/templates/release-github.yml b/.ci/templates/release-github.yml
index 39fd47f1c..c200954f1 100644
--- a/.ci/templates/release-github.yml
+++ b/.ci/templates/release-github.yml
@@ -1,11 +1,13 @@
1steps: 1steps:
2 - template: ./release-download.yml 2 - template: ./release-download.yml
3 - task: GitHubRelease@0 3 - task: GitHubRelease@0
4 displayName: 'GitHub Release'
4 inputs: 5 inputs:
5 action: 'create' 6 action: 'create'
6 title: 'yuzu $(BuildName) #$(Build.BuildId)' 7 title: '$(ReleasePrefix) $(DisplayVersion)'
7 assets: '$(Build.ArtifactStagingDirectory)/*' 8 assets: '$(Build.ArtifactStagingDirectory)/*'
8 gitHubConnection: $(GitHubReleaseConnectionName) 9 gitHubConnection: $(GitHubReleaseConnectionName)
9 repositoryName: '$(Build.Repository.Name)' 10 repositoryName: '$(Build.Repository.Name)'
10 target: '$(Build.SourceVersion)' 11 target: '$(Build.SourceVersion)'
11 tagSource: 'auto' \ No newline at end of file 12 tagSource: manual
13 tag: $(BuildName)-$(DisplayPrefix)-$(DisplayVersion) \ No newline at end of file
diff --git a/.ci/templates/release-private-tag.yml b/.ci/templates/release-private-tag.yml
new file mode 100644
index 000000000..e80d57593
--- /dev/null
+++ b/.ci/templates/release-private-tag.yml
@@ -0,0 +1,9 @@
1steps:
2 - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
3 displayName: 'Apply Git Configuration'
4 - script: git tag -a $(BuildName)-$(DisplayPrefix)-$(DisplayVersion) -m "yuzu $(BuildName) $(Build.BuildNumber) $(Build.DefinitionName) $(DisplayPrefix)-$(DisplayVersion)"
5 displayName: 'Tag Source'
6 - script: git remote add other $(GitRepoPushChangesURL)
7 displayName: 'Register Repository'
8 - script: git push other $(BuildName)-$(DisplayPrefix)-$(DisplayVersion)
9 displayName: 'Update Code' \ No newline at end of file
HIC SVNT DRACONES