Merge branch 'master' into sg-move-background-jobs-to-separate-crate

Author: jtgeibel

.buildpacks

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

.travis.yml

@@ -35,14 +35,6 @@ before_script:
 addons:
   chrome: stable
   postgresql: "9.5"
-  apt:
-    sources:
-      - kalakris-cmake
-    packages:
-      - cmake
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
 
 matrix:
   fast_finish: true

Cargo.lock

@@ -11,7 +11,6 @@ edition = "2018"
 
 [profile.release]
 opt-level = 2
-debug = true
 
 [lib]
 name = "cargo_registry"
@@ -31,7 +30,7 @@ rustdoc-args = [
 [dependencies]
 cargo-registry-s3 = { path = "src/s3", version = "0.2.0" }
 rand = "0.6"
-git2 = "0.6.4"
+git2 = "0.8.0"
 flate2 = "1.0"
 semver = { version = "0.9", git = "https://github.com/steveklabnik/semver.git", features = ["diesel", "serde"] }
 url = "1.2.1"
@@ -54,8 +53,8 @@ serde_json = "1.0.0"
 serde_derive = "1.0.0"
 serde = "1.0.0"
 chrono = { version = "0.4.0", features = ["serde"] }
-comrak = { version = "0.2.3", default-features = false }
-ammonia = "1.0.0"
+comrak = { version = "0.4.0", default-features = false }
+ammonia = "2.0.0"
 docopt = "0.8.1"
 scheduled-thread-pool = "0.2.0"
 derive_deref = "1.0.0"

Cargo.toml

@@ -1,3 +1,2 @@
 web: bin/diesel migration run && bin/start-nginx ./target/release/server
-worker: ./target/release/update-downloads daemon 300
 background_worker: ./target/release/background-worker

Procfile

@@ -1,6 +1,7 @@
 # crates.io
 
 [![Build Status](https://travis-ci.org/rust-lang/crates.io.svg?branch=master)](https://travis-ci.org/rust-lang/crates.io)
+[![What's Deployed](https://img.shields.io/badge/whatsdeployed-prod-green.svg)](https://whatsdeployed.io/s-9IG)
 
 Source code for the default [Cargo](http://doc.crates.io) registry. Viewable
 online at [crates.io](https://crates.io).

README.md

@@ -233,7 +233,7 @@
                     <h3>Dev-Dependencies</h3>
                     <ul>
                         {{#each currentDevDependencies as |dep|}}
-                            {{link-to-dep dep=dep}}
+                            {{link-to-dep tagName="li" dep=dep}}
                         {{/each}}
                     </ul>
                 </div>

app/templates/crate/version.hbs

@@ -1,7 +1,7 @@
 FROM rust:latest
 
 RUN apt-get update \
-    && apt-get install -y postgresql cmake \
+    && apt-get install -y postgresql \
     && rm -rf /var/lib/apt/lists/* \
     && cargo install diesel_cli --no-default-features --features postgres
 

backend.Dockerfile

@@ -145,7 +145,6 @@ In order to run the backend, you will need to have installed:
 
 - [Rust](https://www.rust-lang.org/en-US/) stable >= 1.16.0 and cargo, which comes with Rust
 - [Postgres](https://www.postgresql.org/) >= 9.5
-- [CMake](https://cmake.org/download/) >= 3.6.1
 - [OpenSSL](https://www.openssl.org/) >= 1.0.2k
 - [diesel_cli](http://diesel.rs/guides/getting-started/) >= 1.2.0
 
@@ -230,15 +229,6 @@ by typing `\q`) without any errors to connect to your running Postgres server.
 > we'll help fix the problem and and will add the solution to these
 > instructions!
 
-##### CMake
-
-- All platforms: CMake [has binary distributions
-  available](https://cmake.org/download/)
-- macOS: you can also install with homebrew by using `brew install cmake`
-- Linux: you should be able to use the distribution repositories by doing `sudo
-  apt-get install cmake` (Ubuntu) or `sudo dnf install cmake` (Fedora) or
-  whatever is appropriate for your distribution.
-
 ##### OpenSSL
 
 - Windows: [Win32 OpenSSL Installation

docs/CONTRIBUTING.md

@@ -2,6 +2,24 @@
 
 set -e
 
+manual_stamp_file=target/ci_manual_stamp
+manual_stamp=2 # Change this to force a clean build on CI
+
+if [ -f $manual_stamp_file ]; then
+    if echo "$manual_stamp" | cmp -s $manual_stamp_file -; then
+        : # Do nothing, fall through to version check below
+    else
+        echo "A clean build has been requested, running cargo clean"
+        cargo clean
+    fi
+else
+    echo "Existing stamp not found, running cargo clean"
+    cargo clean
+fi
+
+# If `cargo clean` was run above, then the target/ directory is now
+# gone and the messages below will not be printed
+
 stamp_file=target/rustc_version_stamp
 current_version=$(rustc --version)
 
@@ -13,10 +31,9 @@ if [ -f $stamp_file ]; then
         echo "The version of rustc has changed, running cargo clean"
         cargo clean
     fi
-else
-    echo "There is no existing version stamp, keeping the cache intact"
 fi
 
-# Save the version stamp for next time
+# Save the version stamps for next time
 mkdir -p target/
 echo $current_version > $stamp_file
+echo $manual_stamp > $manual_stamp_file

script/ci/cargo-clean-on-new-rustc-version.sh

@@ -42,11 +42,15 @@ fn main() {
             .and_then(|s| s.parse().ok())
             .unwrap_or(8888)
     };
-    let threads = if config.env == Env::Development {
-        1
-    } else {
-        50
-    };
+    let threads = env::var("SERVER_THREADS")
+        .map(|s| s.parse().expect("SERVER_THREADS was not a valid number"))
+        .unwrap_or_else(|_| {
+            if config.env == Env::Development {
+                1
+            } else {
+                50
+            }
+        });
 
     let server = if env::var("USE_HYPER").is_ok() {
         println!("Booting with a hyper based server");

src/bin/server.rs

@@ -7,26 +7,17 @@ use cargo_registry::{
     db,
     models::VersionDownload,
     schema::{crate_downloads, crates, metadata, version_downloads, versions},
+    util::CargoResult,
 };
-use std::{env, thread, time::Duration};
 
 use diesel::prelude::*;
 
 static LIMIT: i64 = 1000;
 
-fn main() {
-    let daemon = env::args().nth(1).as_ref().map(|s| &s[..]) == Some("daemon");
-    let sleep = env::args().nth(2).map(|s| s.parse().unwrap());
-    loop {
-        let conn = db::connect_now().unwrap();
-        update(&conn).unwrap();
-        drop(conn);
-        if daemon {
-            thread::sleep(Duration::new(sleep.unwrap(), 0));
-        } else {
-            break;
-        }
-    }
+fn main() -> CargoResult<()> {
+    let conn = db::connect_now()?;
+    update(&conn)?;
+    Ok(())
 }
 
 fn update(conn: &PgConnection) -> QueryResult<()> {

src/bin/update-downloads.rs

@@ -190,6 +190,7 @@ impl<'a> MarkdownRenderer<'a> {
     /// Renders the given markdown to HTML using the current settings.
     fn to_html(&self, text: &str) -> CargoResult<String> {
         let options = comrak::ComrakOptions {
+            unsafe_: true, // The output will be sanitized with `ammonia`
             ext_autolink: true,
             ext_strikethrough: true,
             ext_table: true,