mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-09 15:29:08 +01:00
Merge pull request #2867 from j-selby/tag-naming
Implement correct folder structure for CI builds
This commit is contained in:
commit
a3aa8617bc
2 changed files with 23 additions and 8 deletions
|
@ -123,9 +123,16 @@ cp README.md "$REV_NAME"
|
||||||
|
|
||||||
tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME"
|
tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$REV_NAME"
|
||||||
|
|
||||||
mv "$REV_NAME" nightly
|
# Find out what release we are building
|
||||||
|
if [ -z $TRAVIS_TAG ]; then
|
||||||
|
RELEASE_NAME=head
|
||||||
|
else
|
||||||
|
RELEASE_NAME=$(echo $TRAVIS_TAG | cut -d- -f1)
|
||||||
|
fi
|
||||||
|
|
||||||
7z a "$REV_NAME.7z" nightly
|
mv "$REV_NAME" $RELEASE_NAME
|
||||||
|
|
||||||
|
7z a "$REV_NAME.7z" $RELEASE_NAME
|
||||||
|
|
||||||
# move the compiled archive into the artifacts directory to be uploaded by travis releases
|
# move the compiled archive into the artifacts directory to be uploaded by travis releases
|
||||||
mv "$ARCHIVE_NAME" artifacts/
|
mv "$ARCHIVE_NAME" artifacts/
|
||||||
|
|
20
appveyor.yml
20
appveyor.yml
|
@ -46,13 +46,21 @@ after_build:
|
||||||
7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb
|
7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb
|
||||||
rm .\build\bin\release\*.pdb
|
rm .\build\bin\release\*.pdb
|
||||||
|
|
||||||
mkdir nightly
|
# Find out which kind of release we are producing by tag name
|
||||||
Copy-Item .\build\bin\release\* -Destination nightly -Recurse
|
if ($env:APPVEYOR_REPO_TAG_NAME) {
|
||||||
Copy-Item .\license.txt -Destination nightly
|
$RELEASE_DIST, $RELEASE_VERSION = $env:APPVEYOR_REPO_TAG_NAME.split('-')
|
||||||
Copy-Item .\README.md -Destination nightly
|
} else {
|
||||||
|
# There is no repo tag - make assumptions
|
||||||
|
$RELEASE_DIST = "head"
|
||||||
|
}
|
||||||
|
|
||||||
7z a -tzip $MSVC_BUILD_NAME nightly\*
|
mkdir $RELEASE_DIST
|
||||||
7z a $MSVC_SEVENZIP nightly
|
Copy-Item .\build\bin\release\* -Destination $RELEASE_DIST -Recurse
|
||||||
|
Copy-Item .\license.txt -Destination $RELEASE_DIST
|
||||||
|
Copy-Item .\README.md -Destination $RELEASE_DIST
|
||||||
|
|
||||||
|
7z a -tzip $MSVC_BUILD_NAME $RELEASE_DIST\*
|
||||||
|
7z a $MSVC_SEVENZIP $RELEASE_DIST
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
- cd build && ctest -VV -C Release && cd ..
|
- cd build && ctest -VV -C Release && cd ..
|
||||||
|
|
Loading…
Reference in a new issue