diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-08-11 00:00:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 00:00:52 -0400 |
| commit | 72bf84411071b7d949f4670e40587743477d44ae (patch) | |
| tree | aa4b47b2be648d34b8121743f0d983c48aa11776 | |
| parent | 253e1e6941ee9998ec72d027f7e40141c52213ca (diff) | |
| parent | 050c7608225502662d495357d55327b42b3c7b33 (diff) | |
Merge pull request #8686 from lat9nq/graft-source
ci: Graft source when archiving
| -rw-r--r-- | .ci/scripts/common/post-upload.sh | 4 | ||||
| -rw-r--r-- | .ci/scripts/windows/upload.ps1 | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/.ci/scripts/common/post-upload.sh b/.ci/scripts/common/post-upload.sh index 7f910b2b3..0930b7a7b 100644 --- a/.ci/scripts/common/post-upload.sh +++ b/.ci/scripts/common/post-upload.sh @@ -8,8 +8,10 @@ cp LICENSE.txt "$DIR_NAME" cp README.md "$DIR_NAME" if [[ -z "${NO_SOURCE_PACK}" ]]; then - tar -cJvf "${REV_NAME}-source.tar.xz" src externals CMakeLists.txt README.md LICENSE.txt + git clone --depth 1 file://$(readlink -e .) ${REV_NAME}-source + tar -cJvf "${REV_NAME}-source.tar.xz" ${REV_NAME}-source cp -v "${REV_NAME}-source.tar.xz" "$DIR_NAME" + cp -v "${REV_NAME}-source.tar.xz" "${ARTIFACTS_DIR}/" fi tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$DIR_NAME" diff --git a/.ci/scripts/windows/upload.ps1 b/.ci/scripts/windows/upload.ps1 index f2368be6f..d463281de 100644 --- a/.ci/scripts/windows/upload.ps1 +++ b/.ci/scripts/windows/upload.ps1 @@ -42,14 +42,10 @@ mkdir $RELEASE_DIST mkdir $MSVC_SOURCE mkdir "artifacts" +$CURRENT_DIR = Convert-Path . + # Build a tar.xz for the source of the release -Copy-Item .\LICENSE.txt -Destination $MSVC_SOURCE -Copy-Item .\README.md -Destination $MSVC_SOURCE -Copy-Item .\CMakeLists.txt -Destination $MSVC_SOURCE -Copy-Item .\src -Recurse -Destination $MSVC_SOURCE -Copy-Item .\externals -Recurse -Destination $MSVC_SOURCE -Copy-Item .\dist -Recurse -Destination $MSVC_SOURCE -Copy-Item .\CMakeModules -Recurse -Destination $MSVC_SOURCE +git clone --depth 1 file://$CURRENT_DIR $MSVC_SOURCE 7z a -r -ttar $MSVC_SOURCE_TAR $MSVC_SOURCE 7z a -r -txz $MSVC_SOURCE_TARXZ $MSVC_SOURCE_TAR |