From 8e7fa6bb971ea05a13aef198b08baab7f7e1eacb Mon Sep 17 00:00:00 2001 From: alamin655 <129589283+alamin655@users.noreply.github.com> Date: Sun, 6 Aug 2023 12:38:17 +0530 Subject: [PATCH 1/8] Update .gitpod.yml --- .gitpod.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 4eeabff..1871734 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,23 +1,24 @@ --- -image: gitpod/workspace-base +image: gitpod/workspace-rust # Commands that will run on workspace start tasks: - name: Setup, Install & Build - before: apt install cargo redis-server nodejs npm -y && cargo test - init: cargo install cargo-watch - command: redis-server --port 8080 & cargo watch -q -w "." -x "run" + before: apt install redis-server nodejs npm -y + init: cargo build -r + command: redis-server --port 8080 & ./target/release/websurfx + # Ports to expose on workspace startup ports: - name: Website description: Website Preview port: 8080 - onOpen: open-preview + onOpen: notify # vscode IDE setup vscode: extensions: - vadimcn.vscode-lldb - cschleiden.vscode-github-actions - - rust-lang.rust + - rust-lang.rust-analyzer - bungcip.better-toml - serayuzgur.crates - usernamehw.errorlens @@ -26,7 +27,6 @@ vscode: - stylelint.vscode-stylelint - dbaeumer.vscode-eslint - evgeniypeshkov.syntax-highlighter - - redhat.vscode-yaml - ms-azuretools.vscode-docker - Catppuccin.catppuccin-vsc - PKief.material-icon-theme From 5b12b7bbe8ee86f7d60f604d4843ababf9790eb5 Mon Sep 17 00:00:00 2001 From: alamin655 <129589283+alamin655@users.noreply.github.com> Date: Sun, 6 Aug 2023 13:55:51 +0530 Subject: [PATCH 2/8] Update .gitpod.yml --- .gitpod.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 1871734..c26dd43 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,18 +1,13 @@ --- -image: gitpod/workspace-rust +image: + file: .gitpod.Dockerfile + # Commands that will run on workspace start tasks: - - name: Setup, Install & Build - before: apt install redis-server nodejs npm -y + - name: Build & Deploy init: cargo build -r - command: redis-server --port 8080 & ./target/release/websurfx + command: redis-server --port 8082 & ./target/release/websurfx -# Ports to expose on workspace startup -ports: - - name: Website - description: Website Preview - port: 8080 - onOpen: notify # vscode IDE setup vscode: extensions: @@ -32,7 +27,9 @@ vscode: - PKief.material-icon-theme - oderwat.indent-rainbow - formulahendry.auto-rename-tag - - eamodio.gitlens + - swellaby.vscode-rust-test-adapter + - belfz.search-crates-io + github: prebuilds: master: true @@ -40,5 +37,5 @@ github: pullRequests: true pullRequestsFromForks: true addCheck: true - addComment: false + addComment: false addBadge: true From a2146861a834acb16b749b3858033150e09c98f0 Mon Sep 17 00:00:00 2001 From: alamin655 <129589283+alamin655@users.noreply.github.com> Date: Sun, 6 Aug 2023 13:56:52 +0530 Subject: [PATCH 3/8] Create .gitpod.Dockerfile --- .gitpod.Dockerfile | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitpod.Dockerfile diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 0000000..c479341 --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,3 @@ +FROM gitpod/workspace-rust + +RUN sudo install-packages redis-server nodejs npm From 9b4833aaa2e9e84bbdfd3605d1457fa6ef21a6f4 Mon Sep 17 00:00:00 2001 From: alamin655 <129589283+alamin655@users.noreply.github.com> Date: Sun, 6 Aug 2023 17:44:03 +0530 Subject: [PATCH 4/8] chore: bump the app version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 9770f76..0f921bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "0.16.3" +version = "0.16.4" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From cb473cf9f26245b5645722bfc4190c837b71d71d Mon Sep 17 00:00:00 2001 From: alamin655 <129589283+alamin655@users.noreply.github.com> Date: Sun, 6 Aug 2023 17:51:11 +0530 Subject: [PATCH 5/8] chore: bump the app version --- Cargo.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9427ee1..96812fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2090,9 +2090,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c" [[package]] name = "pin-utils" @@ -2391,9 +2391,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -2403,9 +2403,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -2539,9 +2539,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.6" +version = "0.38.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f" +checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" dependencies = [ "bitflags 2.3.3", "errno", @@ -2684,18 +2684,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.181" +version = "1.0.182" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890" +checksum = "bdb30a74471f5b7a1fa299f40b4bf1be93af61116df95465b2b5fc419331e430" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.181" +version = "1.0.182" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed" +checksum = "6f4c2c6ea4bc09b5c419012eafcdb0fcef1d9119d626c8f3a0708a5b92d38a70" dependencies = [ "proc-macro2 1.0.66", "quote 1.0.32", @@ -3534,7 +3534,7 @@ dependencies = [ [[package]] name = "websurfx" -version = "0.16.3" +version = "0.16.4" dependencies = [ "actix-cors", "actix-files", From 2adf9aa9c379dd9dec252e076eb8bee9bbd86e88 Mon Sep 17 00:00:00 2001 From: alamin655 <129589283+alamin655@users.noreply.github.com> Date: Sun, 6 Aug 2023 17:59:37 +0530 Subject: [PATCH 6/8] Update .gitpod.yml --- .gitpod.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitpod.yml b/.gitpod.yml index c26dd43..6822d0b 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -29,6 +29,8 @@ vscode: - formulahendry.auto-rename-tag - swellaby.vscode-rust-test-adapter - belfz.search-crates-io + - hbenl.test-adapter-converter + - hbenl.vscode-test-explorer github: prebuilds: From d4bb6ecb5742ece55b58b2e8da895abd911765a9 Mon Sep 17 00:00:00 2001 From: alamin655 <129589283+alamin655@users.noreply.github.com> Date: Sun, 6 Aug 2023 20:52:29 +0530 Subject: [PATCH 7/8] Add gitlens extension Co-authored-by: neon_arch --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 6822d0b..e82d97a 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -31,7 +31,7 @@ vscode: - belfz.search-crates-io - hbenl.test-adapter-converter - hbenl.vscode-test-explorer - + - eamodio.gitlens github: prebuilds: master: true From 23864c01c104531a1b3cd0af76c11c23725f0cd2 Mon Sep 17 00:00:00 2001 From: alamin655 <129589283+alamin655@users.noreply.github.com> Date: Sun, 6 Aug 2023 21:13:28 +0530 Subject: [PATCH 8/8] Update .gitpod.yml --- .gitpod.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index e82d97a..d1b8f3b 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -4,9 +4,15 @@ image: # Commands that will run on workspace start tasks: - - name: Build & Deploy - init: cargo build -r - command: redis-server --port 8082 & ./target/release/websurfx + - name: Start Redis Server + command: redis-server --port 8082 + - name: Run The App + init: cargo build + command: PKG_ENV=dev ./target/release/websurfx + - name: Tests + command: cargo test + - name: Clippy Checks + command: cargo clippy # vscode IDE setup vscode: @@ -32,6 +38,7 @@ vscode: - hbenl.test-adapter-converter - hbenl.vscode-test-explorer - eamodio.gitlens + github: prebuilds: master: true