PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-18 13:55:23 -05:00
Code Releases Activity

Fix i386 CI releases

Browse source 
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.
This commit is contained in:
Christian Duerr 2018-11-13 23:05:51 +01:00
parent f5e2f39979
commit 355190076a
No known key found for this signature in database
GPG key ID: 85CDAE3C164BA7B4
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ci/before_deploy.sh
View file

@ -25,31 +25,34 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
make dmg make dmg
mv "./target/release/osx/Alacritty.dmg" "./target/deploy/${name}.dmg" mv "./target/release/osx/Alacritty.dmg" "./target/deploy/${name}.dmg"
elif [ "$TRAVIS_OS_NAME" == "linux" ]; then elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
cargo install cargo-deb docker pull undeadleech/alacritty-ubuntu
docker pull undeadleech/alacritty-ubuntu-i386
# x86_64 # x86_64
docker pull undeadleech/alacritty-ubuntu
docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu \ docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu \
/root/.cargo/bin/cargo build --release --manifest-path /source/Cargo.toml /root/.cargo/bin/cargo build --release --manifest-path /source/Cargo.toml
sudo chown -R $USER:$USER "./target" sudo chown -R $USER:$USER "./target"
tar -cvzf "./target/deploy/${name}-x86_64.tar.gz" -C "./target/release/" "alacritty" tar -cvzf "./target/deploy/${name}-x86_64.tar.gz" -C "./target/release/" "alacritty"
# x86_64 deb # x86_64 deb
DEB=$(cargo deb --no-build) sudo docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu \
mv "$DEB" "./target/deploy/${name}_amd64.deb" 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" rm -rf "./target/release"
# i386 # i386
docker pull undeadleech/alacritty-ubuntu-i386 docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu-i386 \
docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu \
/root/.cargo/bin/cargo build --release --manifest-path /source/Cargo.toml /root/.cargo/bin/cargo build --release --manifest-path /source/Cargo.toml
sudo chown -R $USER:$USER "./target" sudo chown -R $USER:$USER "./target"
tar -cvzf "./target/deploy/${name}-i386.tar.gz" -C "./target/release/" "alacritty" tar -cvzf "./target/deploy/${name}-i386.tar.gz" -C "./target/release/" "alacritty"
# i386 deb # i386 deb
DEB=$(cargo deb --no-build) sudo docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu-i386 \
mv "$DEB" "./target/deploy/${name}_i386.deb" 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 elif [ "$TRAVIS_OS_NAME" == "windows" ]; then
mv "./target/release/alacritty.exe" "./target/deploy/${name}.exe" mv "./target/release/alacritty.exe" "./target/deploy/${name}.exe"
mv "./target/release/winpty-agent.exe" "./target/deploy/winpty-agent.exe" mv "./target/release/winpty-agent.exe" "./target/deploy/winpty-agent.exe"

1
ci/i386/Dockerfile
View file

@ -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 curl https://sh.rustup.rs -sSf | sh -s -- -y
RUN /root/.cargo/bin/rustup default stable-i686-unknown-linux-gnu RUN /root/.cargo/bin/rustup default stable-i686-unknown-linux-gnu
RUN /root/.cargo/bin/cargo install cargo-deb

1
ci/x86_64/Dockerfile
View file

@ -5,3 +5,4 @@ ENV USER root
RUN apt-get update && apt-get install -y cmake libfreetype6-dev libfontconfig1-dev curl 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 curl https://sh.rustup.rs -sSf | sh -s -- -y
RUN /root/.cargo/bin/cargo install cargo-deb