diff options
| author | Christian Duerr <contact@christianduerr.com> | 2018-11-13 23:05:51 +0100 |
|---|---|---|
| committer | Christian Duerr <contact@christianduerr.com> | 2018-11-13 23:07:26 +0100 |
| commit | 355190076a7644b3c14c0a1ccc39f56181f3e73d (patch) | |
| tree | e877fd16c126d8c766620e38f4f16e54991fb96b | |
| parent | f5e2f39979e2983399dd867cb6f844256fd14163 (diff) | |
| download | alacritty-355190076a7644b3c14c0a1ccc39f56181f3e73d.tar.gz alacritty-355190076a7644b3c14c0a1ccc39f56181f3e73d.zip | |
Fix i386 CI releases
The i386 CI releases were still using x86_64 platforms for building the
output binaries, as a result the produced binaries did not work properly
on i386 systems.
| -rwxr-xr-x | ci/before_deploy.sh | 19 | ||||
| -rw-r--r-- | ci/i386/Dockerfile | 1 | ||||
| -rw-r--r-- | ci/x86_64/Dockerfile | 1 |
3 files changed, 13 insertions, 8 deletions
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index 04793032..caaa97c6 100755 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -25,31 +25,34 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then make dmg mv "./target/release/osx/Alacritty.dmg" "./target/deploy/${name}.dmg" elif [ "$TRAVIS_OS_NAME" == "linux" ]; then - cargo install cargo-deb + docker pull undeadleech/alacritty-ubuntu + docker pull undeadleech/alacritty-ubuntu-i386 # 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}-x86_64.tar.gz" -C "./target/release/" "alacritty" # x86_64 deb - DEB=$(cargo deb --no-build) - mv "$DEB" "./target/deploy/${name}_amd64.deb" + sudo docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu \ + sh -c "cd /source && /root/.cargo/bin/cargo deb" + sudo chown -R $USER:$USER "./target" + mv "./target/debian/*.deb" "./target/deploy/${name}_amd64.deb" rm -rf "./target/release" # i386 - docker pull undeadleech/alacritty-ubuntu-i386 - docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu \ + docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu-i386 \ /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" + sudo docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu-i386 \ + sh -c "cd /source && /root/.cargo/bin/cargo deb" + sudo chown -R $USER:$USER "./target" + mv "./target/debian/*.deb" "./target/deploy/${name}_amd64.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" diff --git a/ci/i386/Dockerfile b/ci/i386/Dockerfile index c9d3fc15..cdec1ec5 100644 --- a/ci/i386/Dockerfile +++ b/ci/i386/Dockerfile @@ -6,3 +6,4 @@ RUN apt-get update && apt-get install -y cmake libfreetype6-dev libfontconfig1-d RUN curl https://sh.rustup.rs -sSf | sh -s -- -y RUN /root/.cargo/bin/rustup default stable-i686-unknown-linux-gnu +RUN /root/.cargo/bin/cargo install cargo-deb diff --git a/ci/x86_64/Dockerfile b/ci/x86_64/Dockerfile index 573de9a3..b94c07cc 100644 --- a/ci/x86_64/Dockerfile +++ b/ci/x86_64/Dockerfile @@ -5,3 +5,4 @@ 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/cargo install cargo-deb |