mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu-mainline.git
				synced 2025-03-21 01:53:15 +00:00 
			
		
		
		
	Merge pull request #3077 from yuzu-emu/revert-3073-azure-rename-partial
Revert "ci: Rename build folder only on non-mainline builds"
This commit is contained in:
		
						commit
						63d30133f8
					
				| @ -1,12 +1,12 @@ | |||||||
| #!/bin/bash -ex | #!/bin/bash -ex | ||||||
| 
 | 
 | ||||||
| # Copy documentation | # Copy documentation | ||||||
| cp license.txt "$DIR_NAME" | cp license.txt "$REV_NAME" | ||||||
| cp README.md "$DIR_NAME" | cp README.md "$REV_NAME" | ||||||
| 
 | 
 | ||||||
| tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$DIR_NAME" | tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME" | ||||||
| 
 | 
 | ||||||
| mv "$DIR_NAME" $RELEASE_NAME | mv "$REV_NAME" $RELEASE_NAME | ||||||
| 
 | 
 | ||||||
| 7z a "$REV_NAME.7z" $RELEASE_NAME | 7z a "$REV_NAME.7z" $RELEASE_NAME | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -6,15 +6,9 @@ REV_NAME="yuzu-linux-${GITDATE}-${GITREV}" | |||||||
| ARCHIVE_NAME="${REV_NAME}.tar.xz" | ARCHIVE_NAME="${REV_NAME}.tar.xz" | ||||||
| COMPRESSION_FLAGS="-cJvf" | COMPRESSION_FLAGS="-cJvf" | ||||||
| 
 | 
 | ||||||
| if [ "${RELEASE_NAME}" = "mainline" ]; then | mkdir "$REV_NAME" | ||||||
|     DIR_NAME="${REV_NAME}_${RELEASE_NAME}" |  | ||||||
| else |  | ||||||
|     DIR_NAME="${REV_NAME}" |  | ||||||
| fi |  | ||||||
| 
 | 
 | ||||||
| mkdir "$DIR_NAME" | cp build/bin/yuzu-cmd "$REV_NAME" | ||||||
| 
 | cp build/bin/yuzu "$REV_NAME" | ||||||
| cp build/bin/yuzu-cmd "$DIR_NAME" |  | ||||||
| cp build/bin/yuzu "$DIR_NAME" |  | ||||||
| 
 | 
 | ||||||
| . .ci/scripts/common/post-upload.sh | . .ci/scripts/common/post-upload.sh | ||||||
|  | |||||||
| @ -1,13 +1,6 @@ | |||||||
| param($BUILD_NAME) |  | ||||||
| 
 |  | ||||||
| $GITDATE = $(git show -s --date=short --format='%ad') -replace "-","" | $GITDATE = $(git show -s --date=short --format='%ad') -replace "-","" | ||||||
| $GITREV = $(git show -s --format='%h') | $GITREV = $(git show -s --format='%h') | ||||||
| 
 |  | ||||||
| if ("$BUILD_NAME" -eq "mainline") { |  | ||||||
|     $RELEASE_DIST = "yuzu-windows-msvc-$BUILD_NAME" |  | ||||||
| } else { |  | ||||||
| $RELEASE_DIST = "yuzu-windows-msvc" | $RELEASE_DIST = "yuzu-windows-msvc" | ||||||
| } |  | ||||||
| 
 | 
 | ||||||
| $MSVC_BUILD_ZIP = "yuzu-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", "" | $MSVC_BUILD_ZIP = "yuzu-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", "" | ||||||
| $MSVC_BUILD_PDB = "yuzu-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", "" | $MSVC_BUILD_PDB = "yuzu-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", "" | ||||||
|  | |||||||
| @ -6,14 +6,8 @@ REV_NAME="yuzu-windows-mingw-${GITDATE}-${GITREV}" | |||||||
| ARCHIVE_NAME="${REV_NAME}.tar.gz" | ARCHIVE_NAME="${REV_NAME}.tar.gz" | ||||||
| COMPRESSION_FLAGS="-czvf" | COMPRESSION_FLAGS="-czvf" | ||||||
| 
 | 
 | ||||||
| if [ "${RELEASE_NAME}" = "mainline" ]; then | mkdir "$REV_NAME" | ||||||
|     DIR_NAME="${REV_NAME}_${RELEASE_NAME}" |  | ||||||
| else |  | ||||||
|     DIR_NAME="${REV_NAME}" |  | ||||||
| fi |  | ||||||
| 
 |  | ||||||
| mkdir "$DIR_NAME" |  | ||||||
| # get around the permission issues | # get around the permission issues | ||||||
| cp -r package/* "$DIR_NAME" | cp -r package/* "$REV_NAME" | ||||||
| 
 | 
 | ||||||
| . .ci/scripts/common/post-upload.sh | . .ci/scripts/common/post-upload.sh | ||||||
|  | |||||||
| @ -17,7 +17,6 @@ steps: | |||||||
|   inputs: |   inputs: | ||||||
|     targetType: 'filePath' |     targetType: 'filePath' | ||||||
|     filePath: './.ci/scripts/windows/upload.ps1' |     filePath: './.ci/scripts/windows/upload.ps1' | ||||||
|     arguments: '$(BuildName)' |  | ||||||
| - publish: artifacts | - publish: artifacts | ||||||
|   artifact: 'yuzu-$(BuildName)-windows-msvc' |   artifact: 'yuzu-$(BuildName)-windows-msvc' | ||||||
|   displayName: 'Upload Artifacts' |   displayName: 'Upload Artifacts' | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 bunnei
						bunnei