summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Duerr <contact@christianduerr.com>2020-05-12 15:18:37 +0000
committerGitHub <noreply@github.com>2020-05-12 15:18:37 +0000
commit73c7f0c48d32ab5dc4b50e14e875306f4ddb6545 (patch)
tree0c513882d279d216d622d7ad8233a1c9124e07c9
parent77f2d6e853f1ad54e6dc844a811b78daeb463e76 (diff)
Remove prebuilt linux binaries
Fixes #3628.
-rw-r--r--.travis.yml3
-rw-r--r--CHANGELOG.md1
-rw-r--r--INSTALL.md25
-rw-r--r--alacritty/Cargo.toml19
-rw-r--r--ci/amd64/Dockerfile9
-rwxr-xr-xci/before_deploy.sh32
-rw-r--r--ci/i386/Dockerfile10
-rw-r--r--extra/linux/debian/postinst3
-rw-r--r--extra/linux/debian/prerm3
9 files changed, 4 insertions, 101 deletions
diff --git a/.travis.yml b/.travis.yml
index 5b4e6493..504b4a50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,5 @@
language: rust
-services:
- - docker
-
addons:
apt:
packages:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce8b7a47..7a6bfcc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Packaging
- Minimum Rust version has been bumped to 1.41.0
+- Prebuilt Linux binaries have been removed
### Added
diff --git a/INSTALL.md b/INSTALL.md
index 6b400193..1370923a 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -25,7 +25,6 @@
1. [Desktop Entry](#desktop-entry)
2. [MacOS](#macos)
3. [Cargo](#cargo)
- 4. [Debian/Ubuntu](#debianubuntu-1)
3. [Manual Page](#manual-page)
4. [Shell Completions](#shell-completions)
1. [Zsh](#zsh)
@@ -65,12 +64,9 @@ drivers installed too (these are called `libegl1-mesa-dev` on Ubuntu).
#### Debian/Ubuntu
-You can build alacritty using `cargo deb` and use your system's package manager
-to maintain the application using the instructions [below](#debianubuntu-1).
-
-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.
+If you'd 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
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
```
-### 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
Installing the manual page requires the additional dependency `gzip`.
diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml
index 5e390fa9..c981da09 100644
--- a/alacritty/Cargo.toml
+++ b/alacritty/Cargo.toml
@@ -57,22 +57,3 @@ wayland = ["alacritty_terminal/wayland"]
live-shader-reload = []
nightly = []
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"
diff --git a/ci/amd64/Dockerfile b/ci/amd64/Dockerfile
deleted file mode 100644
index a3cef725..00000000
--- a/ci/amd64/Dockerfile
+++ /dev/null
@@ -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
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
index 23112e9d..c2a335e1 100755
--- a/ci/before_deploy.sh
+++ b/ci/before_deploy.sh
@@ -36,40 +36,8 @@ function osx {
&& 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
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
windows
fi
diff --git a/ci/i386/Dockerfile b/ci/i386/Dockerfile
deleted file mode 100644
index 6c53d14b..00000000
--- a/ci/i386/Dockerfile
+++ /dev/null
@@ -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
diff --git a/extra/linux/debian/postinst b/extra/linux/debian/postinst
deleted file mode 100644
index 55a6032d..00000000
--- a/extra/linux/debian/postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /usr/bin/alacritty 20
diff --git a/extra/linux/debian/prerm b/extra/linux/debian/prerm
deleted file mode 100644
index 61427c04..00000000
--- a/extra/linux/debian/prerm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-update-alternatives --remove x-terminal-emulator /usr/bin/alacritty