Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'revert-a2cfc4ba' into 'master'

Browse Source 
Revert "Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'"

See merge request veloren/veloren!674
This commit is contained in:
Forest Anderson 2019-12-01 22:26:16 +00:00
commit 1da30875c0
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.gitlab-ci.yml
View File

@ -37,11 +37,6 @@ optional-release:linux:
- cp target/release/veloren-voxygen $CI_PROJECT_DIR - cp target/release/veloren-voxygen $CI_PROJECT_DIR
- strip --strip-all veloren-server-cli - strip --strip-all veloren-server-cli
- strip --strip-all veloren-voxygen - strip --strip-all veloren-voxygen
# Compress ogg and WAV
- find assets/ -type f -name "*.ogg" | xargs -i@ ffmpeg -i @ -c:a libopus -b:a 32000 -compression_level 0 -application audio @.audiocompress.ogg
- find assets/ -type f -name "*.wav" | xargs -i@ ffmpeg -i @ -ab 32000 -vbr on -compression_level 0 -application audio @.audiocompress.wav
# Overwrite old files
- find assets/ -type f -name "*.audiocompress.*" | xargs -i@ sh -c 'name=@ && mv -f @ ${name%.*.*}'
artifacts: artifacts:
paths: paths:
- veloren-server-cli - veloren-server-cli
@ -144,11 +139,6 @@ linux:
- cp -r target/release/veloren-voxygen $CI_PROJECT_DIR - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR
- strip --strip-all veloren-server-cli - strip --strip-all veloren-server-cli
- strip --strip-all veloren-voxygen - strip --strip-all veloren-voxygen
# Compress ogg and WAV
- find assets/ -type f -name "*.ogg" | xargs -i@ ffmpeg -i @ -c:a libopus -b:a 32000 -compression_level 0 -application audio @.audiocompress.ogg
- find assets/ -type f -name "*.wav" | xargs -i@ ffmpeg -i @ -ab 32000 -vbr on -compression_level 0 -application audio @.audiocompress.wav
# Overwrite old files
- find assets/ -type f -name "*.audiocompress.*" | xargs -i@ sh -c 'name=@ && mv -f @ ${name%.*.*}'
artifacts: artifacts:
paths: paths:
- veloren-server-cli - veloren-server-cli
@ -172,11 +162,6 @@ windows:
- VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --release - VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --release
- cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR - cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
- cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR - cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
# Compress ogg and WAV
- find assets/ -type f -name "*.ogg" | xargs -i@ ffmpeg -i @ -c:a libopus -b:a 32000 -compression_level 0 -application audio @.audiocompress.ogg
- find assets/ -type f -name "*.wav" | xargs -i@ ffmpeg -i @ -ab 32000 -vbr on -compression_level 0 -application audio @.audiocompress.wav
# Overwrite old files
- find assets/ -type f -name "*.audiocompress.*" | xargs -i@ sh -c 'name=@ && mv -f @ ${name%.*.*}'
artifacts: artifacts:
paths: paths:
- veloren-server-cli.exe - veloren-server-cli.exe
@ -185,4 +170,4 @@ windows:
- LICENSE - LICENSE
expire_in: 1 week expire_in: 1 week
# -- # --