From d0d9683df8398696147e7ee1fcffb2e4e957008c Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Sat, 4 Apr 2020 14:39:19 -0700 Subject: Remove vendored dependencies While it appears that by now we actually can get successful builds without Cargo insisting on Internet access by virtue of using the --frozen flag, maintaining vendored dependencies is somewhat of a pain point. This state will also get worse with upcoming changes that replace argparse in favor of structopt and pull in a slew of new dependencies by doing so. Then there is also the repository structure aspect, which is non-standard due to the way we vendor dependencies and a potential source of confusion. In order to fix these problems, this change removes all the vendored dependencies we have. Delete subrepo argparse/:argparse Delete subrepo base32/:base32 Delete subrepo cc/:cc Delete subrepo cfg-if/:cfg-if Delete subrepo getrandom/:getrandom Delete subrepo lazy-static/:lazy-static Delete subrepo libc/:libc Delete subrepo nitrokey-sys/:nitrokey-sys Delete subrepo nitrokey/:nitrokey Delete subrepo rand/:rand --- nitrokey/.builds/archlinux-msrv.yml | 22 ---------------------- nitrokey/.builds/archlinux-use-system-lib.yml | 25 ------------------------- nitrokey/.builds/archlinux.yml | 16 ---------------- nitrokey/.builds/lint.yml | 16 ---------------- 4 files changed, 79 deletions(-) delete mode 100644 nitrokey/.builds/archlinux-msrv.yml delete mode 100644 nitrokey/.builds/archlinux-use-system-lib.yml delete mode 100644 nitrokey/.builds/archlinux.yml delete mode 100644 nitrokey/.builds/lint.yml (limited to 'nitrokey/.builds') diff --git a/nitrokey/.builds/archlinux-msrv.yml b/nitrokey/.builds/archlinux-msrv.yml deleted file mode 100644 index 66c0390..0000000 --- a/nitrokey/.builds/archlinux-msrv.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2019 Robin Krahl -# SPDX-License-Identifier: CC0-1.0 -image: archlinux -packages: - - rustup - - libnitrokey -environment: - USE_SYSTEM_LIBNITROKEY: "1" -sources: - - https://git.ireas.org/nitrokey-rs -tasks: - - setup: | - rustup set profile minimal - rustup default 1.34.2 - - version: | - rustc -V - - build: | - cd nitrokey-rs - cargo build --release - - test: | - cd nitrokey-rs - cargo test diff --git a/nitrokey/.builds/archlinux-use-system-lib.yml b/nitrokey/.builds/archlinux-use-system-lib.yml deleted file mode 100644 index 29bda19..0000000 --- a/nitrokey/.builds/archlinux-use-system-lib.yml +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2019 Robin Krahl -# SPDX-License-Identifier: CC0-1.0 -image: archlinux -packages: - - rust - - libnitrokey -environment: - USE_SYSTEM_LIBNITROKEY: "1" -sources: - - https://git.ireas.org/nitrokey-rs -tasks: - - version: | - rustc -V - - build: | - cd nitrokey-rs - cargo build --release - - test: | - cd nitrokey-rs - cargo test - - format: | - cd nitrokey-rs - cargo fmt -- --check - - clippy: | - cd nitrokey-rs - cargo clippy -- -D warnings diff --git a/nitrokey/.builds/archlinux.yml b/nitrokey/.builds/archlinux.yml deleted file mode 100644 index 151eb66..0000000 --- a/nitrokey/.builds/archlinux.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2019 Robin Krahl -# SPDX-License-Identifier: CC0-1.0 -image: archlinux -packages: - - rust - - hidapi - - gcc -sources: - - https://git.ireas.org/nitrokey-rs -tasks: - - build: | - cd nitrokey-rs - cargo build --release - - test: | - cd nitrokey-rs - cargo test diff --git a/nitrokey/.builds/lint.yml b/nitrokey/.builds/lint.yml deleted file mode 100644 index 678cde8..0000000 --- a/nitrokey/.builds/lint.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2019 Robin Krahl -# SPDX-License-Identifier: CC0-1.0 -image: archlinux -packages: - - gnupg - - reuse -sources: - - https://git.ireas.org/nitrokey-rs -tasks: - - verify: | - cd nitrokey-rs - curl -s "https://pgp.ireas.org/0x6D533958F070C57C.txt" | gpg --import - git verify-commit HEAD - - reuse: | - cd nitrokey-rs - reuse lint -- cgit v1.2.1