diff options
| author | Christian Duerr <chrisduerr@users.noreply.github.com> | 2018-11-06 00:40:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 00:40:29 +0000 |
| commit | 06fbb891cf4d0cbac97cd5ed41fa465e8ed84369 (patch) | |
| tree | f3a8b652f77a291bcc532c4c4589ecc03205f585 | |
| parent | 0e49bfb02a80c480df802f2f0a79dc2fa0de6753 (diff) | |
Add automated i386 docker builds to travis
| -rwxr-xr-x | ci/before_deploy.sh | 27 | ||||
| -rw-r--r-- | ci/i386/Dockerfile | 8 | ||||
| -rw-r--r-- | ci/x86_64/Dockerfile (renamed from ci/Dockerfile) | 0 |
3 files changed, 26 insertions, 9 deletions
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index e89a5590..f30d3015 100755 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -21,27 +21,36 @@ mkdir "./target/deploy" # Output binary name name="Alacritty-${TRAVIS_TAG}" -# Create macOS binary if [ "$TRAVIS_OS_NAME" == "osx" ]; then make dmg mv "./target/release/osx/Alacritty.dmg" "./target/deploy/${name}.dmg" -fi +elif [ "$TRAVIS_OS_NAME" == "linux" ]; then + cargo install cargo-deb -# Create Linux binaries -if [ "$TRAVIS_OS_NAME" == "linux" ]; then + # x86_64 docker pull undeadleech/alacritty-ubuntu docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu \ /root/.cargo/bin/cargo build --release --manifest-path /source/Cargo.toml sudo chown -R $USER:$USER "./target" - tar -cvzf "./target/deploy/${name}-$(uname -m).tar.gz" -C "./target/release/" "alacritty" + tar -cvzf "./target/deploy/${name}-x86_64.tar.gz" -C "./target/release/" "alacritty" - cargo install cargo-deb + # x86_64 deb DEB=$(cargo deb --no-build) mv "$DEB" "./target/deploy/${name}_amd64.deb" -fi -# Create windows binary -if [ "$TRAVIS_OS_NAME" == "windows" ]; then + rm -rf "./target/release" + + # i386 + docker pull undeadleech/alacritty-ubuntu-i386 + docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu \ + /root/.cargo/bin/cargo build --release --manifest-path /source/Cargo.toml + sudo chown -R $USER:$USER "./target" + tar -cvzf "./target/deploy/${name}-i386.tar.gz" -C "./target/release/" "alacritty" + + # i386 deb + DEB=$(cargo deb --no-build) + mv "$DEB" "./target/deploy/${name}_i386.deb" +elif [ "$TRAVIS_OS_NAME" == "windows" ]; then mv "./target/release/alacritty.exe" "./target/deploy/${name}.exe" mv "./target/release/winpty-agent.exe" "./target/deploy/winpty-agent.exe" fi diff --git a/ci/i386/Dockerfile b/ci/i386/Dockerfile new file mode 100644 index 00000000..c9d3fc15 --- /dev/null +++ b/ci/i386/Dockerfile @@ -0,0 +1,8 @@ +FROM i386/ubuntu:latest + +ENV USER root + +RUN apt-get update && apt-get install -y cmake libfreetype6-dev libfontconfig1-dev curl + +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y +RUN /root/.cargo/bin/rustup default stable-i686-unknown-linux-gnu diff --git a/ci/Dockerfile b/ci/x86_64/Dockerfile index 573de9a3..573de9a3 100644 --- a/ci/Dockerfile +++ b/ci/x86_64/Dockerfile |