diff options
| author | Theodore Dubois <tblodt@icloud.com> | 2019-04-28 06:24:58 -0700 |
|---|---|---|
| committer | Christian Duerr <chrisduerr@users.noreply.github.com> | 2019-04-28 13:24:58 +0000 |
| commit | dbd8538762ef8968a493e1bf996e8693479ca783 (patch) | |
| tree | 32ac2a6a5e01238a272d4ba534551d2e42903c7a /ci | |
| parent | 9c6d12ea2c863ba76015bdedc00db13b7307725a (diff) | |
Split alacritty into a separate crates
The crate containing the entry point is called alacritty, and the crate
containing everything else is called alacritty_terminal.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/before_deploy.sh | 4 | ||||
| -rwxr-xr-x | ci/script.sh | 27 |
2 files changed, 6 insertions, 25 deletions
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index 98fae1bc..5919e112 100755 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -34,7 +34,7 @@ elif [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$ARCH" != "i386" ]; then # x86_64 deb docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu \ sh -c "cd /source && \ - /root/.cargo/bin/cargo deb --no-build --output ./target/deploy/${name}-ubuntu_18_04_amd64.deb" + /root/.cargo/bin/cargo deb --no-build --manifest-path alacritty/Cargo.toml --output ./target/deploy/${name}-ubuntu_18_04_amd64.deb" # Make sure all files can be uploaded without permission errors sudo chown -R $USER:$USER "./target" @@ -49,7 +49,7 @@ elif [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$ARCH" == "i386" ]; then # i386 deb docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu-i386 \ sh -c "cd /source && \ - /root/.cargo/bin/cargo deb --no-build --output ./target/deploy/${name}-ubuntu_18_04_i386.deb" + /root/.cargo/bin/cargo deb --no-build --manifest-path alacritty/Cargo.toml --output ./target/deploy/${name}-ubuntu_18_04_i386.deb" # Make sure all files can be uploaded without permission errors sudo chown -R $USER:$USER "./target" diff --git a/ci/script.sh b/ci/script.sh index 21991415..87dc872f 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -1,8 +1,5 @@ #!/bin/bash -# Check if any command failed -error=false - # Run clippy checks if [ "$CLIPPY" == "true" ]; then cargo clippy --all-targets @@ -17,25 +14,9 @@ fi # Run test in release mode if a tag is present, to produce an optimized binary if [ -n "$TRAVIS_TAG" ]; then - cargo test --release || error=true + # Build separately so we generate an 'alacritty' binary without -HASH appended + cargo build --release + cargo test --release else - cargo test || error=true -fi - -# Test the font subcrate -cargo test -p font || error=true - -# Test the winpty subcrate -if [ "$TRAVIS_OS_NAME" == "windows" ]; then - if [ -n "$TRAVIS_TAG" ]; then - mkdir -p "./target/debug/deps" - cp "./target/release/winpty-agent.exe" "./target/debug/deps" - else - cp "./target/debug/winpty-agent.exe" "./target/debug/deps" - fi - cargo test -p winpty || error=true -fi - -if [ $error == "true" ]; then - exit 1 + cargo test fi |