Remove prebuilt linux binaries

Fixes #3628.
This commit is contained in:
Christian Duerr 2020-05-12 15:18:37 +00:00 committed by GitHub
parent 77f2d6e853
commit 73c7f0c48d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 4 additions and 101 deletions

View File

@ -1,8 +1,5 @@
language: rust language: rust
services:
- docker
addons: addons:
apt: apt:
packages: packages:

View File

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Packaging ### Packaging
- Minimum Rust version has been bumped to 1.41.0 - Minimum Rust version has been bumped to 1.41.0
- Prebuilt Linux binaries have been removed
### Added ### Added

View File

@ -25,7 +25,6 @@
1. [Desktop Entry](#desktop-entry) 1. [Desktop Entry](#desktop-entry)
2. [MacOS](#macos) 2. [MacOS](#macos)
3. [Cargo](#cargo) 3. [Cargo](#cargo)
4. [Debian/Ubuntu](#debianubuntu-1)
3. [Manual Page](#manual-page) 3. [Manual Page](#manual-page)
4. [Shell Completions](#shell-completions) 4. [Shell Completions](#shell-completions)
1. [Zsh](#zsh) 1. [Zsh](#zsh)
@ -65,12 +64,9 @@ drivers installed too (these are called `libegl1-mesa-dev` on Ubuntu).
#### Debian/Ubuntu #### Debian/Ubuntu
You can build alacritty using `cargo deb` and use your system's package manager If you'd like to build a local version manually, you need a few extra libraries
to maintain the application using the instructions [below](#debianubuntu-1). to build Alacritty. Here's an apt command that should install all of them. If
something is still found to be missing, please open an issue.
If you'd still like to build a local version manually, you need a few extra
libraries to build Alacritty. Here's an apt command that should install all of
them. If something is still found to be missing, please open an issue.
```sh ```sh
apt-get install cmake pkg-config libfreetype6-dev libfontconfig1-dev libxcb-xfixes0-dev python3 apt-get install cmake pkg-config libfreetype6-dev libfontconfig1-dev libxcb-xfixes0-dev python3
@ -255,21 +251,6 @@ If you don't want to clone the repository, you can install Alacritty directly us
cargo install --git https://github.com/alacritty/alacritty cargo install --git https://github.com/alacritty/alacritty
``` ```
### Debian/Ubuntu
Using `cargo deb`, you can create and install a deb file.
```sh
cargo install cargo-deb
cargo deb --install -p alacritty
```
To choose a default terminal app, use Debian's `update-alternatives`.
```sh
update-alternatives --config x-terminal-emulator
```
## Manual Page ## Manual Page
Installing the manual page requires the additional dependency `gzip`. Installing the manual page requires the additional dependency `gzip`.

View File

@ -57,22 +57,3 @@ wayland = ["alacritty_terminal/wayland"]
live-shader-reload = [] live-shader-reload = []
nightly = [] nightly = []
bench = [] bench = []
[package.metadata.deb]
maintainer = "Christian Duerr <contact@christianduerr.com>"
license-file = ["../LICENSE-APACHE", "3"]
extended-description = """\
Alacritty is the fastest terminal emulator in existence. Using the GPU for \
rendering enables optimizations that simply aren't possible without it. """
depends = "$auto"
section = "rust"
priority = "optional"
assets = [
["../target/release/alacritty", "usr/bin/", "755"],
["../extra/linux/Alacritty.desktop", "usr/share/applications/", "644"],
["../extra/logo/alacritty-term.svg", "usr/share/pixmaps/Alacritty.svg", "644"],
["../extra/completions/alacritty.bash", "usr/share/bash-completion/completions/alacritty", "644"],
["../extra/completions/alacritty.fish", "usr/share/fish/completions/alacritty.fish", "644"],
["../extra/completions/_alacritty", "usr/share/zsh/vendor-completions/_alacritty", "644"],
]
maintainer-scripts = "../extra/linux/debian"

View File

@ -1,9 +0,0 @@
FROM ubuntu:latest
ENV USER root
RUN apt-get update && apt-get install -y cmake libfreetype6-dev libfontconfig1-dev curl python3 \
libxcb-xfixes0-dev
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
RUN /root/.cargo/bin/cargo install cargo-deb

View File

@ -36,40 +36,8 @@ function osx {
&& mv "./target/release/osx/Alacritty.dmg" "./target/deploy/${name}.dmg" && mv "./target/release/osx/Alacritty.dmg" "./target/deploy/${name}.dmg"
} }
function debian {
arch=$1
docker pull "undeadleech/alacritty-ubuntu-${arch}" \
&& docker_tar "alacritty-ubuntu-${arch}" "ubuntu_18_04_${arch}" \
&& docker_deb "alacritty-ubuntu-${arch}" "ubuntu_18_04_${arch}" \
&& sudo chown -R $USER:$USER "./target"
}
function docker_tar {
image=$1
archname=$2
docker run -v "$(pwd):/source" "undeadleech/${image}" \
/root/.cargo/bin/cargo build --release --manifest-path /source/Cargo.toml
tar -cvzf "./target/deploy/${name}-${archname}.tar.gz" -C "./target/release/" "alacritty"
}
function docker_deb {
image=$1
archname=$2
docker run -v "$(pwd):/source" "undeadleech/${image}" sh -c \
"cd /source && /root/.cargo/bin/cargo deb --no-build -p alacritty \
--output ./target/deploy/${name}-${archname}.deb"
}
if [ "$TRAVIS_OS_NAME" == "osx" ]; then if [ "$TRAVIS_OS_NAME" == "osx" ]; then
osx || exit osx || exit
elif [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$ARCH" != "i386" ]; then
debian "amd64" || exit
elif [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$ARCH" == "i386" ]; then
debian "i386" || exit
elif [ "$TRAVIS_OS_NAME" == "windows" ]; then elif [ "$TRAVIS_OS_NAME" == "windows" ]; then
windows windows
fi fi

View File

@ -1,10 +0,0 @@
FROM i386/ubuntu:latest
ENV USER root
RUN apt-get update && apt-get install -y cmake libfreetype6-dev libfontconfig1-dev curl python3 \
libxcb-xfixes0-dev
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

View File

@ -1,3 +0,0 @@
#!/bin/sh -e
update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /usr/bin/alacritty 20

View File

@ -1,3 +0,0 @@
#!/bin/sh -e
update-alternatives --remove x-terminal-emulator /usr/bin/alacritty