Skip to content

Commit 044d713

Browse files
committed
Bump git2 and remove dependency on cmake
The `git2` crate has dropped its dependnecy on `cmake` and we can as well.
1 parent a1e04e4 commit 044d713

File tree

6 files changed

+42
-74
lines changed

6 files changed

+42
-74
lines changed

.buildpacks

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
https://github.com/Starkast/heroku-buildpack-cmake#a243c67
21
https://github.com/emk/heroku-buildpack-rust#578d630
32
https://codon-buildpacks.s3.amazonaws.com/buildpacks/heroku/emberjs.tgz
43
https://github.com/heroku/heroku-buildpack-nginx.git#fbc49cd

.travis.yml

-8
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ before_script:
3535
addons:
3636
chrome: stable
3737
postgresql: "9.5"
38-
apt:
39-
sources:
40-
- kalakris-cmake
41-
packages:
42-
- cmake
43-
- libcurl4-openssl-dev
44-
- libelf-dev
45-
- libdw-dev
4638

4739
matrix:
4840
fast_finish: true

Cargo.lock

+40-53
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ rustdoc-args = [
3030
[dependencies]
3131
cargo-registry-s3 = { path = "src/s3", version = "0.2.0" }
3232
rand = "0.6"
33-
git2 = "0.6.4"
33+
git2 = "0.8.0"
3434
flate2 = "1.0"
3535
semver = { version = "0.9", git = "https://github.com/steveklabnik/semver.git", features = ["diesel", "serde"] }
3636
url = "1.2.1"

backend.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM rust:latest
22

33
RUN apt-get update \
4-
&& apt-get install -y postgresql cmake \
4+
&& apt-get install -y postgresql \
55
&& rm -rf /var/lib/apt/lists/* \
66
&& cargo install diesel_cli --no-default-features --features postgres
77

docs/CONTRIBUTING.md

-10
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ In order to run the backend, you will need to have installed:
145145

146146
- [Rust](https://www.rust-lang.org/en-US/) stable >= 1.16.0 and cargo, which comes with Rust
147147
- [Postgres](https://www.postgresql.org/) >= 9.5
148-
- [CMake](https://cmake.org/download/) >= 3.6.1
149148
- [OpenSSL](https://www.openssl.org/) >= 1.0.2k
150149
- [diesel_cli](http://diesel.rs/guides/getting-started/) >= 1.2.0
151150

@@ -230,15 +229,6 @@ by typing `\q`) without any errors to connect to your running Postgres server.
230229
> we'll help fix the problem and and will add the solution to these
231230
> instructions!
232231
233-
##### CMake
234-
235-
- All platforms: CMake [has binary distributions
236-
available](https://cmake.org/download/)
237-
- macOS: you can also install with homebrew by using `brew install cmake`
238-
- Linux: you should be able to use the distribution repositories by doing `sudo
239-
apt-get install cmake` (Ubuntu) or `sudo dnf install cmake` (Fedora) or
240-
whatever is appropriate for your distribution.
241-
242232
##### OpenSSL
243233
244234
- Windows: [Win32 OpenSSL Installation

0 commit comments

Comments
 (0)