From f840e49e72ec9275517c6ded214ba3af36e95cfc Mon Sep 17 00:00:00 2001 From: Forest Anderson Date: Sun, 1 Dec 2019 22:12:26 +0000 Subject: [PATCH] Revert "Merge branch 'angelonfira/add-asset-separation-and-compression' into 'master'" This reverts merge request !650 --- .gitlab-ci.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c09be14e58..e0020e089f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,11 +37,6 @@ optional-release:linux: - cp target/release/veloren-voxygen $CI_PROJECT_DIR - strip --strip-all veloren-server-cli - 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: paths: - veloren-server-cli @@ -144,11 +139,6 @@ linux: - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR - strip --strip-all veloren-server-cli - 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: paths: - veloren-server-cli @@ -172,11 +162,6 @@ windows: - 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-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: paths: - veloren-server-cli.exe @@ -185,4 +170,4 @@ windows: - LICENSE expire_in: 1 week -# -- \ No newline at end of file +# --