Updated .gitlab-ci.yml

.gitlab-ci.yml

@@ -60,26 +60,16 @@ test:nightly:
 # Exits and builds fails if on bad format
 lint:rustfmt:
   image: "rustlang/rust:nightly"
-  before_script:
-  - apt-get update -yqq
-  - apt-get install -yqq --no-install-recommends build-essential
-  - apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev
-  - export PATH="$PATH:$HOME/.cargo/bin"
-  - which rustfmt || cargo install rustfmt-nightly
   script:
   - rustc --version && cargo --version
+  - cargo install rustfmt-nightly
   - cargo fmt --all -- --write-mode=diff
 
 # Configure and run clippy on nightly
 # Only fails on errors atm.
 lint:clippy:
   image: "rustlang/rust:nightly"
-  before_script:
-  - apt-get update -yqq
-  - apt-get install -yqq --no-install-recommends build-essential
-  - apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev
-  - export PATH="$PATH:$HOME/.cargo/bin"
-  - which rustfmt || cargo install clippy
   script:
   - rustc --version && cargo --version
+  - cargo install clippy
   - cargo clippy --all

TODO.md

@@ -33,13 +33,6 @@
 - [ ] Fix Etag/Last-modified implementation. [#2](https://gitlab.gnome.org/alatiera/Hammond/issues/2)
 
 
-**Look into:**
-
-- [x] Icons && install stuff && flatpak
-
-* Neither flatpak nor meson support atm building from cargo.
-
-
 **DB changes:**
 
 - [x] episodes: add watched field

configure

@@ -1,7 +1,8 @@
+#!/bin/bash
+
 # Adapted from:
 # https://gitlab.gnome.org/danigm/libgepub/blob/27f0d374e0c8f6fa972dbd111d4ce0c0f3096914/configure_meson
 
-#!/bin/bash
 # configure script adapter for Meson
 # Based on build-api: https://github.com/cgwalters/build-api
 # Copyright 2010, 2011, 2013 Colin Walters <walters@verbum.org>