From 68f7454971ef855861c8bf234975eb5b221ec401 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 16:27:55 +0100 Subject: [PATCH 01/26] Adjusted linter --- Cargo.toml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 734c69f..2fe1754 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,3 +6,12 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] + +[lints.rust] +unsafe_code = "forbid" + +[lints.clippy] +enum_glob_use = "deny" # https://rust-lang.github.io/rust-clippy/master/index.html#/enum_glob_use +pedantic = "deny" +nursery = "deny" +unwrap_used = "deny" # https://rust-lang.github.io/rust-clippy/master/index.html#/unwrap_used \ No newline at end of file -- 2.45.2 From 8b2b410f00dbb7d0c85eae82a1a500edbb9c7d75 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 16:32:25 +0100 Subject: [PATCH 02/26] Add clippy as linter and display formatting suggestions --- .drone.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.drone.yml b/.drone.yml index 96cd379..ab80512 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,6 +19,20 @@ steps: - cargo --version - cargo test --verbose --all +- name: lint-clippy [debug] + image: rust:alpine + commands: + - rustc --version + - cargo --version + - cargo clippy --verbose --all + +- name: format [debug] + image: rust:alpine + commands: + - rustc --version + - cargo --version + - cargo fmt --verbose --all --check + --- kind: pipeline name: arm64 [debug] @@ -41,6 +55,20 @@ steps: - cargo --version - cargo test --verbose --all +- name: lint-clippy [debug] + image: rust:alpine + commands: + - rustc --version + - cargo --version + - cargo clippy --verbose --all + +- name: format [debug] + image: rust:alpine + commands: + - rustc --version + - cargo --version + - cargo fmt --verbose --all --check + --- kind: pipeline name: amd64 [release] -- 2.45.2 From a03b91d1d4f8303d756260113ba97fe9e0dbdf0c Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 16:33:22 +0100 Subject: [PATCH 03/26] add clippy component to rustup --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index ab80512..7c63bdd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,6 +24,7 @@ steps: commands: - rustc --version - cargo --version + - rustup component add clippy - cargo clippy --verbose --all - name: format [debug] @@ -60,6 +61,7 @@ steps: commands: - rustc --version - cargo --version + - rustup component add clippy - cargo clippy --verbose --all - name: format [debug] -- 2.45.2 From ff8fceab67a45cd296011e878387ddab7c352cb7 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 16:34:02 +0100 Subject: [PATCH 04/26] added rustfmt component to rustup ci --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 7c63bdd..99b857f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,6 +32,7 @@ steps: commands: - rustc --version - cargo --version + - rustup component add rustfmt - cargo fmt --verbose --all --check --- @@ -69,6 +70,7 @@ steps: commands: - rustc --version - cargo --version + - rustup component add rustfmt - cargo fmt --verbose --all --check --- -- 2.45.2 From 4d75894067cb0867b98d5ef054c7567994e74047 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 16:51:13 +0100 Subject: [PATCH 05/26] Updated arm image to arm64v8/rust:alpine --- .drone.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 99b857f..5c57baf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,21 +44,21 @@ platform: steps: - name: build [debug] - image: rust:alpine + image: arm64v8/rust:alpine commands: - rustc --version - cargo --version - cargo build --verbose --all - name: test [debug] - image: rust:alpine + image: arm64v8/rust:alpine commands: - rustc --version - cargo --version - cargo test --verbose --all - name: lint-clippy [debug] - image: rust:alpine + image: arm64v8/rust:alpine commands: - rustc --version - cargo --version @@ -66,7 +66,7 @@ steps: - cargo clippy --verbose --all - name: format [debug] - image: rust:alpine + image: arm64v8/rust:alpine commands: - rustc --version - cargo --version @@ -97,7 +97,7 @@ platform: steps: - name: build and test [release] - image: rust:alpine + image: arm64v8/rust:alpine commands: - rustc --version - cargo --version -- 2.45.2 From bedc5aa8a792d43ae8ba8a5d444edaa5bcf40e5c Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 17:00:29 +0100 Subject: [PATCH 06/26] why the fuck is this broken? --- .drone.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5c57baf..2484c68 100644 --- a/.drone.yml +++ b/.drone.yml @@ -57,13 +57,13 @@ steps: - cargo --version - cargo test --verbose --all -- name: lint-clippy [debug] - image: arm64v8/rust:alpine - commands: - - rustc --version - - cargo --version - - rustup component add clippy - - cargo clippy --verbose --all +#- name: lint-clippy [debug] +# image: arm64v8/rust:alpine +# commands: +# - rustc --version +# - cargo --version +# - rustup component add clippy +# - cargo clippy --verbose --all - name: format [debug] image: arm64v8/rust:alpine -- 2.45.2 From e28349f7d62140fec3973f7d72a6e03a6b0ec087 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 17:03:28 +0100 Subject: [PATCH 07/26] revert bedc5aa8a792d43ae8ba8a5d444edaa5bcf40e5c revert why the fuck is this broken? --- .drone.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2484c68..5c57baf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -57,13 +57,13 @@ steps: - cargo --version - cargo test --verbose --all -#- name: lint-clippy [debug] -# image: arm64v8/rust:alpine -# commands: -# - rustc --version -# - cargo --version -# - rustup component add clippy -# - cargo clippy --verbose --all +- name: lint-clippy [debug] + image: arm64v8/rust:alpine + commands: + - rustc --version + - cargo --version + - rustup component add clippy + - cargo clippy --verbose --all - name: format [debug] image: arm64v8/rust:alpine -- 2.45.2 From 4dbc33bbd5eb9134efd09b6cb74eb35af8de98a7 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 17:21:31 +0100 Subject: [PATCH 08/26] RUST_IMAGE variable --- .drone.yml | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5c57baf..c735bce 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,23 +4,26 @@ name: amd64 [debug] platform: arch: amd64 +environment: + RUST_IMAGE: rust:1.71.1-slim-bookworm + steps: - name: build [debug] - image: rust:alpine + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo build --verbose --all - name: test [debug] - image: rust:alpine + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo test --verbose --all - name: lint-clippy [debug] - image: rust:alpine + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -28,7 +31,7 @@ steps: - cargo clippy --verbose --all - name: format [debug] - image: rust:alpine + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -42,23 +45,26 @@ name: arm64 [debug] platform: arch: arm64 +environment: + RUST_IMAGE: rust:1.71.1-slim-bookworm + steps: - name: build [debug] - image: arm64v8/rust:alpine + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo build --verbose --all - name: test [debug] - image: arm64v8/rust:alpine + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo test --verbose --all - name: lint-clippy [debug] - image: arm64v8/rust:alpine + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -66,7 +72,7 @@ steps: - cargo clippy --verbose --all - name: format [debug] - image: arm64v8/rust:alpine + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -80,9 +86,12 @@ name: amd64 [release] platform: arch: amd64 +environment: + RUST_IMAGE: rust:1.71.1-slim-bookworm + steps: - name: build and test [release] - image: rust:alpine + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -95,9 +104,12 @@ name: arm64 [release] platform: arch: arm64 +environment: + RUST_IMAGE: rust:1.71.1-slim-bookworm + steps: - name: build and test [release] - image: arm64v8/rust:alpine + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version -- 2.45.2 From 7e6a8e07afa0ef2766075df543b1521afb66572a Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 17:25:46 +0100 Subject: [PATCH 09/26] maybe it works this way? --- .drone.yml | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/.drone.yml b/.drone.yml index c735bce..f2e4e51 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,29 +1,24 @@ kind: pipeline name: amd64 [debug] +image: rust:1.71.1-slim-bookworm platform: arch: amd64 -environment: - RUST_IMAGE: rust:1.71.1-slim-bookworm - steps: - name: build [debug] - image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo build --verbose --all - name: test [debug] - image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo test --verbose --all - name: lint-clippy [debug] - image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -31,7 +26,6 @@ steps: - cargo clippy --verbose --all - name: format [debug] - image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -41,30 +35,25 @@ steps: --- kind: pipeline name: arm64 [debug] +image: rust:1.71.1-slim-bookworm platform: arch: arm64 -environment: - RUST_IMAGE: rust:1.71.1-slim-bookworm - steps: - name: build [debug] - image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo build --verbose --all - name: test [debug] - image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo test --verbose --all - name: lint-clippy [debug] - image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -72,7 +61,6 @@ steps: - cargo clippy --verbose --all - name: format [debug] - image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -82,16 +70,13 @@ steps: --- kind: pipeline name: amd64 [release] +image: rust:1.71.1-slim-bookworm platform: arch: amd64 -environment: - RUST_IMAGE: rust:1.71.1-slim-bookworm - steps: - name: build and test [release] - image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -100,16 +85,13 @@ steps: --- kind: pipeline name: arm64 [release] +image: rust:1.71.1-slim-bookworm platform: arch: arm64 -environment: - RUST_IMAGE: rust:1.71.1-slim-bookworm - steps: - name: build and test [release] - image: ${RUST_IMAGE} commands: - rustc --version - cargo --version -- 2.45.2 From 99d6f6d96a68495fbdb07ec2f75d752ebe434054 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 17:26:43 +0100 Subject: [PATCH 10/26] revert 7e6a8e07afa0ef2766075df543b1521afb66572a revert maybe it works this way? --- .drone.yml | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index f2e4e51..c735bce 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,24 +1,29 @@ kind: pipeline name: amd64 [debug] -image: rust:1.71.1-slim-bookworm platform: arch: amd64 +environment: + RUST_IMAGE: rust:1.71.1-slim-bookworm + steps: - name: build [debug] + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo build --verbose --all - name: test [debug] + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo test --verbose --all - name: lint-clippy [debug] + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -26,6 +31,7 @@ steps: - cargo clippy --verbose --all - name: format [debug] + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -35,25 +41,30 @@ steps: --- kind: pipeline name: arm64 [debug] -image: rust:1.71.1-slim-bookworm platform: arch: arm64 +environment: + RUST_IMAGE: rust:1.71.1-slim-bookworm + steps: - name: build [debug] + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo build --verbose --all - name: test [debug] + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version - cargo test --verbose --all - name: lint-clippy [debug] + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -61,6 +72,7 @@ steps: - cargo clippy --verbose --all - name: format [debug] + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -70,13 +82,16 @@ steps: --- kind: pipeline name: amd64 [release] -image: rust:1.71.1-slim-bookworm platform: arch: amd64 +environment: + RUST_IMAGE: rust:1.71.1-slim-bookworm + steps: - name: build and test [release] + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version @@ -85,13 +100,16 @@ steps: --- kind: pipeline name: arm64 [release] -image: rust:1.71.1-slim-bookworm platform: arch: arm64 +environment: + RUST_IMAGE: rust:1.71.1-slim-bookworm + steps: - name: build and test [release] + image: ${RUST_IMAGE} commands: - rustc --version - cargo --version -- 2.45.2 From a3f6584196542397f3178eecae68fbd83ce0f411 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 17:27:03 +0100 Subject: [PATCH 11/26] revert 4dbc33bbd5eb9134efd09b6cb74eb35af8de98a7 revert RUST_IMAGE variable --- .drone.yml | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/.drone.yml b/.drone.yml index c735bce..5c57baf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,26 +4,23 @@ name: amd64 [debug] platform: arch: amd64 -environment: - RUST_IMAGE: rust:1.71.1-slim-bookworm - steps: - name: build [debug] - image: ${RUST_IMAGE} + image: rust:alpine commands: - rustc --version - cargo --version - cargo build --verbose --all - name: test [debug] - image: ${RUST_IMAGE} + image: rust:alpine commands: - rustc --version - cargo --version - cargo test --verbose --all - name: lint-clippy [debug] - image: ${RUST_IMAGE} + image: rust:alpine commands: - rustc --version - cargo --version @@ -31,7 +28,7 @@ steps: - cargo clippy --verbose --all - name: format [debug] - image: ${RUST_IMAGE} + image: rust:alpine commands: - rustc --version - cargo --version @@ -45,26 +42,23 @@ name: arm64 [debug] platform: arch: arm64 -environment: - RUST_IMAGE: rust:1.71.1-slim-bookworm - steps: - name: build [debug] - image: ${RUST_IMAGE} + image: arm64v8/rust:alpine commands: - rustc --version - cargo --version - cargo build --verbose --all - name: test [debug] - image: ${RUST_IMAGE} + image: arm64v8/rust:alpine commands: - rustc --version - cargo --version - cargo test --verbose --all - name: lint-clippy [debug] - image: ${RUST_IMAGE} + image: arm64v8/rust:alpine commands: - rustc --version - cargo --version @@ -72,7 +66,7 @@ steps: - cargo clippy --verbose --all - name: format [debug] - image: ${RUST_IMAGE} + image: arm64v8/rust:alpine commands: - rustc --version - cargo --version @@ -86,12 +80,9 @@ name: amd64 [release] platform: arch: amd64 -environment: - RUST_IMAGE: rust:1.71.1-slim-bookworm - steps: - name: build and test [release] - image: ${RUST_IMAGE} + image: rust:alpine commands: - rustc --version - cargo --version @@ -104,12 +95,9 @@ name: arm64 [release] platform: arch: arm64 -environment: - RUST_IMAGE: rust:1.71.1-slim-bookworm - steps: - name: build and test [release] - image: ${RUST_IMAGE} + image: arm64v8/rust:alpine commands: - rustc --version - cargo --version -- 2.45.2 From eee1e9891ba189fcd8db775e5d9f649240fa3140 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 22 Jan 2024 17:28:23 +0100 Subject: [PATCH 12/26] changed image to a gnu based distro --- .drone.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5c57baf..d1f552e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,21 +6,21 @@ platform: steps: - name: build [debug] - image: rust:alpine + image: rust:1.71.1-slim-bookworm commands: - rustc --version - cargo --version - cargo build --verbose --all - name: test [debug] - image: rust:alpine + image: rust:1.71.1-slim-bookworm commands: - rustc --version - cargo --version - cargo test --verbose --all - name: lint-clippy [debug] - image: rust:alpine + image: rust:1.71.1-slim-bookworm commands: - rustc --version - cargo --version @@ -28,7 +28,7 @@ steps: - cargo clippy --verbose --all - name: format [debug] - image: rust:alpine + image: rust:1.71.1-slim-bookworm commands: - rustc --version - cargo --version @@ -44,21 +44,21 @@ platform: steps: - name: build [debug] - image: arm64v8/rust:alpine + image: rust:1.71.1-slim-bookworm commands: - rustc --version - cargo --version - cargo build --verbose --all - name: test [debug] - image: arm64v8/rust:alpine + image: rust:1.71.1-slim-bookworm commands: - rustc --version - cargo --version - cargo test --verbose --all - name: lint-clippy [debug] - image: arm64v8/rust:alpine + image: rust:1.71.1-slim-bookworm commands: - rustc --version - cargo --version @@ -66,7 +66,7 @@ steps: - cargo clippy --verbose --all - name: format [debug] - image: arm64v8/rust:alpine + image: rust:1.71.1-slim-bookworm commands: - rustc --version - cargo --version @@ -82,7 +82,7 @@ platform: steps: - name: build and test [release] - image: rust:alpine + image: rust:1.71.1-slim-bookworm commands: - rustc --version - cargo --version @@ -97,7 +97,7 @@ platform: steps: - name: build and test [release] - image: arm64v8/rust:alpine + image: rust:1.71.1-slim-bookworm commands: - rustc --version - cargo --version -- 2.45.2 From 194bed6affd9b2ac516560df23f389975ffc42a4 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 29 Jan 2024 19:48:23 +0100 Subject: [PATCH 13/26] missing_const_for_fn --- Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2fe1754..e7f49b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,4 +14,7 @@ unsafe_code = "forbid" enum_glob_use = "deny" # https://rust-lang.github.io/rust-clippy/master/index.html#/enum_glob_use pedantic = "deny" nursery = "deny" -unwrap_used = "deny" # https://rust-lang.github.io/rust-clippy/master/index.html#/unwrap_used \ No newline at end of file +unwrap_used = "deny" # https://rust-lang.github.io/rust-clippy/master/index.html#/unwrap_used +missing_const_for_fn = "warn" +missing_assert_message = "deny" +missing_errors_doc = "deny" \ No newline at end of file -- 2.45.2 From 4d608e66ab05202eb0d6a497979c9a40ef6b63d0 Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 31 Jan 2024 11:45:49 +0100 Subject: [PATCH 14/26] Added rustfmt with hard_tabs=true --- rustfmt.toml | 1 + 1 file changed, 1 insertion(+) create mode 100644 rustfmt.toml diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..18d655e --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1 @@ +hard_tabs = true \ No newline at end of file -- 2.45.2 From 03373a0fbe03b40bcc725a8941e0e8d07180c7cb Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 31 Jan 2024 11:49:06 +0100 Subject: [PATCH 15/26] Added links --- Cargo.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e7f49b5..8d023fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,9 +12,9 @@ unsafe_code = "forbid" [lints.clippy] enum_glob_use = "deny" # https://rust-lang.github.io/rust-clippy/master/index.html#/enum_glob_use -pedantic = "deny" -nursery = "deny" +pedantic = "deny" # https://rust-lang.github.io/rust-clippy/master/index.html#/?groups=pedantic +nursery = "deny" # wip lints: https://rust-lang.github.io/rust-clippy/master/index.html#/?groups=nursery unwrap_used = "deny" # https://rust-lang.github.io/rust-clippy/master/index.html#/unwrap_used -missing_const_for_fn = "warn" -missing_assert_message = "deny" -missing_errors_doc = "deny" \ No newline at end of file +missing_const_for_fn = "warn" # https://rust-lang.github.io/rust-clippy/master/index.html#/missing_const_for_fn +missing_assert_message = "deny" # https://rust-lang.github.io/rust-clippy/master/index.html#/missing_assert_message +missing_errors_doc = "deny" # https://rust-lang.github.io/rust-clippy/master/index.html#/missing_assert_message \ No newline at end of file -- 2.45.2 From cceee5a5c918dd12d7f5af518663f958a8be3826 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 5 Feb 2024 21:47:24 +0100 Subject: [PATCH 16/26] reverted linting and formatting tasks to alpine this should speed up the CIs --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index d1f552e..d2ec881 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,7 @@ steps: - cargo test --verbose --all - name: lint-clippy [debug] - image: rust:1.71.1-slim-bookworm + image: rust:1.71.1-alpine commands: - rustc --version - cargo --version @@ -28,7 +28,7 @@ steps: - cargo clippy --verbose --all - name: format [debug] - image: rust:1.71.1-slim-bookworm + image: rust:1.71.1-alpine commands: - rustc --version - cargo --version @@ -58,7 +58,7 @@ steps: - cargo test --verbose --all - name: lint-clippy [debug] - image: rust:1.71.1-slim-bookworm + image: rust:1.71.1-alpine commands: - rustc --version - cargo --version @@ -66,7 +66,7 @@ steps: - cargo clippy --verbose --all - name: format [debug] - image: rust:1.71.1-slim-bookworm + image: rust:1.71.1-alpine commands: - rustc --version - cargo --version -- 2.45.2 From 0590521493c29dac8505c8a0ed5fc69dc77e5246 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 5 Feb 2024 21:51:47 +0100 Subject: [PATCH 17/26] debug --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index d2ec881..c9f7d83 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,7 +62,7 @@ steps: commands: - rustc --version - cargo --version - - rustup component add clippy + - rustup component add clippy ; sleep 1h - cargo clippy --verbose --all - name: format [debug] @@ -70,7 +70,7 @@ steps: commands: - rustc --version - cargo --version - - rustup component add rustfmt + - rustup component add rustfmt ; sleep 1h - cargo fmt --verbose --all --check --- -- 2.45.2 From b9316e9cc90d6e3386271582b3362e7e18ef8ea7 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 5 Feb 2024 21:52:47 +0100 Subject: [PATCH 18/26] debug --- .drone.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index c9f7d83..3d5a179 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,7 +62,8 @@ steps: commands: - rustc --version - cargo --version - - rustup component add clippy ; sleep 1h + - sleep 1h + - rustup component add clippy - cargo clippy --verbose --all - name: format [debug] @@ -70,7 +71,8 @@ steps: commands: - rustc --version - cargo --version - - rustup component add rustfmt ; sleep 1h + - sleep 1h + - rustup component add rustfmt - cargo fmt --verbose --all --check --- -- 2.45.2 From 123815e0ee062fd2a9dfc2ea1e04f0912c4ef5f5 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 5 Feb 2024 22:14:28 +0100 Subject: [PATCH 19/26] adjusted debug timer --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3d5a179..7d3a148 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,7 +62,7 @@ steps: commands: - rustc --version - cargo --version - - sleep 1h + - sleep 30m - rustup component add clippy - cargo clippy --verbose --all @@ -71,7 +71,7 @@ steps: commands: - rustc --version - cargo --version - - sleep 1h + - sleep 30m - rustup component add rustfmt - cargo fmt --verbose --all --check -- 2.45.2 From 827905cf78ff022b8a7776804951f09996cf95b4 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 5 Feb 2024 23:07:52 +0100 Subject: [PATCH 20/26] dns test --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7d3a148..f95f643 100644 --- a/.drone.yml +++ b/.drone.yml @@ -38,6 +38,7 @@ steps: --- kind: pipeline name: arm64 [debug] +custom_dns: [ 1.1.1.1, 1.0.0.1 ] platform: arch: arm64 @@ -62,7 +63,6 @@ steps: commands: - rustc --version - cargo --version - - sleep 30m - rustup component add clippy - cargo clippy --verbose --all @@ -71,7 +71,6 @@ steps: commands: - rustc --version - cargo --version - - sleep 30m - rustup component add rustfmt - cargo fmt --verbose --all --check -- 2.45.2 From e9c3e5e3df6e1724769b567bfbfd48951f74ba55 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 5 Feb 2024 23:08:35 +0100 Subject: [PATCH 21/26] Test 2 --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index f95f643..de03261 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,6 @@ kind: pipeline name: amd64 [debug] +custom_dns: [ 1.1.1.1, 1.0.0.1 ] platform: arch: amd64 -- 2.45.2 From 6be26487822d9bd638a6f98cc720b19eab380aa0 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 5 Feb 2024 23:09:37 +0100 Subject: [PATCH 22/26] now includes spelling errors! --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index de03261..f70026a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ kind: pipeline name: amd64 [debug] -custom_dns: [ 1.1.1.1, 1.0.0.1 ] +custom_dnss: [ 1.1.1.1, 1.0.0.1 ] platform: arch: amd64 @@ -39,7 +39,7 @@ steps: --- kind: pipeline name: arm64 [debug] -custom_dns: [ 1.1.1.1, 1.0.0.1 ] +custom_dnss: [ 1.1.1.1, 1.0.0.1 ] platform: arch: arm64 -- 2.45.2 From a4f6e0417166dffd9dea709073ac71064b2aeb72 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 5 Feb 2024 23:21:22 +0100 Subject: [PATCH 23/26] stupid workarounds, for stupid problems --- .drone.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index f70026a..1427e6c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,5 @@ kind: pipeline name: amd64 [debug] -custom_dnss: [ 1.1.1.1, 1.0.0.1 ] platform: arch: amd64 @@ -39,7 +38,6 @@ steps: --- kind: pipeline name: arm64 [debug] -custom_dnss: [ 1.1.1.1, 1.0.0.1 ] platform: arch: arm64 @@ -59,11 +57,14 @@ steps: - cargo --version - cargo test --verbose --all -- name: lint-clippy [debug] +- name: lint-clippy [debug] image: rust:1.71.1-alpine commands: - rustc --version - cargo --version + # Stupid workarounds, for stupid problems + - echo "hostname 1.1.1.1 >> /etc/resolv.conf + - echo "hostname 1.0.0.1" >> /etc/resolv.conf - rustup component add clippy - cargo clippy --verbose --all @@ -72,6 +73,9 @@ steps: commands: - rustc --version - cargo --version + # Stupid workarounds, for stupid problems + - echo "hostname 1.1.1.1 >> /etc/resolv.conf + - echo "hostname 1.0.0.1" >> /etc/resolv.conf - rustup component add rustfmt - cargo fmt --verbose --all --check -- 2.45.2 From 979bf7ea9d9f7817b42c7a756e734df52a2eb3e3 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 5 Feb 2024 23:24:50 +0100 Subject: [PATCH 24/26] fixed my stupid fix --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1427e6c..554e835 100644 --- a/.drone.yml +++ b/.drone.yml @@ -63,7 +63,7 @@ steps: - rustc --version - cargo --version # Stupid workarounds, for stupid problems - - echo "hostname 1.1.1.1 >> /etc/resolv.conf + - echo "hostname 1.1.1.1" >> /etc/resolv.conf - echo "hostname 1.0.0.1" >> /etc/resolv.conf - rustup component add clippy - cargo clippy --verbose --all @@ -74,7 +74,7 @@ steps: - rustc --version - cargo --version # Stupid workarounds, for stupid problems - - echo "hostname 1.1.1.1 >> /etc/resolv.conf + - echo "hostname 1.1.1.1" >> /etc/resolv.conf - echo "hostname 1.0.0.1" >> /etc/resolv.conf - rustup component add rustfmt - cargo fmt --verbose --all --check -- 2.45.2 From 5c2b263851817263c262305e0a08af72f5f3f2d5 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 5 Feb 2024 23:25:55 +0100 Subject: [PATCH 25/26] Sleep, bitch --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 554e835..d84c9d2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -65,6 +65,7 @@ steps: # Stupid workarounds, for stupid problems - echo "hostname 1.1.1.1" >> /etc/resolv.conf - echo "hostname 1.0.0.1" >> /etc/resolv.conf + - sleep 30m - rustup component add clippy - cargo clippy --verbose --all @@ -76,6 +77,7 @@ steps: # Stupid workarounds, for stupid problems - echo "hostname 1.1.1.1" >> /etc/resolv.conf - echo "hostname 1.0.0.1" >> /etc/resolv.conf + - sleep 30m - rustup component add rustfmt - cargo fmt --verbose --all --check -- 2.45.2 From ec5d9a251696087bcc7cf0d3c8a3aa9b4c3573af Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 5 Feb 2024 23:27:07 +0100 Subject: [PATCH 26/26] Fixed the stupid fix even more --- .drone.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index d84c9d2..583f12d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -63,9 +63,8 @@ steps: - rustc --version - cargo --version # Stupid workarounds, for stupid problems - - echo "hostname 1.1.1.1" >> /etc/resolv.conf - - echo "hostname 1.0.0.1" >> /etc/resolv.conf - - sleep 30m + - echo "nameserver 1.1.1.1" >> /etc/resolv.conf + - echo "nameserver 1.0.0.1" >> /etc/resolv.conf - rustup component add clippy - cargo clippy --verbose --all @@ -75,9 +74,8 @@ steps: - rustc --version - cargo --version # Stupid workarounds, for stupid problems - - echo "hostname 1.1.1.1" >> /etc/resolv.conf - - echo "hostname 1.0.0.1" >> /etc/resolv.conf - - sleep 30m + - echo "nameserver 1.1.1.1" >> /etc/resolv.conf + - echo "nameserver 1.0.0.1" >> /etc/resolv.conf - rustup component add rustfmt - cargo fmt --verbose --all --check -- 2.45.2