snap: Fix build process for Tier 2 platforms

Unfortunately this only actually *fixes* the build for arm64;
it seems that we hit various bugs in Rust on ppc64 and armhf.

.circleci/config.yml

@@ -19,7 +19,7 @@ executors:
     working_directory: ~/projects/Plume
     environment:
       RUST_TEST_THREADS: 1
-      FEATURES: <<#parameters.postgres>>postgres<</ parameters.postgres>><<^parameters.postgres>>sqlite<</parameters.postgres>>,ci
+      FEATURES: <<#parameters.postgres>>postgres<</ parameters.postgres>><<^parameters.postgres>>sqlite<</parameters.postgres>>
       DATABASE_URL: <<#parameters.postgres>>postgres://postgres@localhost/plume<</parameters.postgres>><<^parameters.postgres>>plume.sqlite<</parameters.postgres>>
 
 

Cargo.toml

@@ -79,7 +79,6 @@ postgres = ["plume-models/postgres", "diesel/postgres"]
 sqlite = ["plume-models/sqlite", "diesel/sqlite"]
 debug-mailer = []
 test = []
-ci = ["plume-models/ci", "plume-api/ci", "plume-common/ci"]
 
 [workspace]
 members = ["plume-api", "plume-cli", "plume-models", "plume-common", "plume-front", "plume-macro"]

plume-api/Cargo.toml

@@ -7,6 +7,3 @@ edition = "2018"
 [dependencies]
 serde = "1.0"
 serde_derive = "1.0"
-
-[features]
-ci = []

plume-api/src/lib.rs

@@ -1,5 +1,3 @@
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
-
 #[macro_use]
 extern crate serde_derive;
 

plume-cli/Cargo.toml

@@ -23,4 +23,3 @@ path = "../plume-models"
 [features]
 postgres = ["plume-models/postgres", "diesel/postgres"]
 sqlite = ["plume-models/sqlite", "diesel/sqlite"]
-ci = ["plume-models/ci"]

plume-cli/src/main.rs

@@ -1,8 +1,7 @@
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
+use dotenv;
 
 use clap::App;
 use diesel::Connection;
-use dotenv;
 use plume_models::{instance::Instance, Connection as Conn, CONFIG};
 use std::io::{self, prelude::*};
 

plume-common/Cargo.toml

@@ -30,6 +30,3 @@ version = "0.4"
 [dependencies.pulldown-cmark]
 default-features = false
 version = "0.2.0"
-
-[features]
-ci = []

plume-common/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
 #![feature(associated_type_defaults)]
 
 #[macro_use]

plume-front/Cargo.toml

@@ -13,6 +13,3 @@ gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a
 lazy_static = "1.3"
 serde = "1.0"
 serde_json = "1.0"
-
-[features]
-ci = []

plume-front/src/main.rs

@@ -1,6 +1,5 @@
 #![recursion_limit = "128"]
 #![feature(decl_macro, proc_macro_hygiene, try_trait)]
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
 
 #[macro_use]
 extern crate gettext_macros;

plume-macro/Cargo.toml

@@ -19,4 +19,3 @@ syn = "0.15.27"
 default = []
 postgres = []
 sqlite = []
-ci = []

plume-macro/src/lib.rs

@@ -1,5 +1,4 @@
 #![recursion_limit = "128"]
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
 
 #[macro_use]
 extern crate quote;

plume-models/Cargo.toml

@@ -54,4 +54,3 @@ diesel_migrations = "1.3.0"
 [features]
 postgres = ["diesel/postgres", "plume-macro/postgres" ]
 sqlite = ["diesel/sqlite", "plume-macro/sqlite" ]
-ci = ["plume-macro/ci"]

plume-models/src/lib.rs

@@ -1,7 +1,6 @@
 #![feature(try_trait)]
 #![feature(never_type)]
 #![feature(proc_macro_hygiene)]
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
 
 #[macro_use]
 extern crate diesel;

snap/snapcraft.yaml

@@ -8,7 +8,7 @@ description: |
    * Media management: you can upload pictures to illustrate your articles, but also audio files if you host a podcast, and manage them all from Plume.
    * Federation: Plume is part of a network of interconnected websites called the Fediverse. Each of these websites (often called instances) have their own rules and thematics, but they can all communicate with each other.
    * Collaborative writing: invite other people to your blogs, and write articles together.
-grade: devel # must be 'stable' to release into candidate/stable channels
+grade: stable
 confinement: strict
 
 apps:
@@ -25,26 +25,26 @@ parts:
   plume:
     plugin: rust
     source: .
-    rust-revision: nightly-2019-03-23
+    rust-revision: nightly-2020-01-15
     build-packages:
       - libssl-dev
       - pkg-config
       - libsqlite3-dev
       - gettext
-      - on arm64,armhf,ppc64el,s390x:
+      - libclang-9-dev
-        - lld-8
+      - lld-9
     override-build: |
       snapcraftctl set-version $(git describe --tags)
       export PATH=$PATH:$HOME/.cargo/bin
-      rustup install stable
+      rustup install --force --profile=minimal stable
       cargo +stable install --force cargo-web
 
       # Only Tier 1 Rust platforms get rust-lld
       # On the others (arm64, armhf, powerpc64, s390x) fall back to using
       # the system LLD we've installed earlier.
-      case ${SNAPCRAFT_ARCH_TRIPLE} in \
+      case ${SNAPCRAFT_ARCH_TRIPLET} in \
-        aarch64-linux-gnu|arm-linux-gnueabihf|powerpc64-linux-gnu|s390x-linux-gnu) \
+        aarch64-linux-gnu|arm-linux-gnueabihf|powerpc64le-linux-gnu|s390x-linux-gnu) \
-          RUSTFLAGS="-C linker=lld-8" cargo web deploy -p plume-front --release \
+          RUSTFLAGS="-C linker=lld-9" cargo web deploy -p plume-front --release \
           ;; \
         *) \
           cargo web deploy -p plume-front --release \

src/main.rs

@@ -1,5 +1,4 @@
 #![allow(clippy::too_many_arguments)]
-#![cfg_attr(not(feature = "ci"), warn(missing_docs))]
 #![feature(decl_macro, proc_macro_hygiene, try_trait)]
 
 #[macro_use]