From adab603511c4f9900f38d465263980e0fae3a0dd Mon Sep 17 00:00:00 2001 From: Kasper Juul Hermansen Date: Thu, 27 Oct 2022 20:12:46 +0000 Subject: [PATCH 1/2] Pin dependencies --- Cargo.lock | 105 ++++++++++++++++++++++------------- Dockerfile | 4 +- src/cmd/scel/Cargo.toml | 4 +- src/lib/scel_api/Cargo.toml | 16 +++--- src/lib/scel_core/Cargo.toml | 10 ++-- src/web/package.json | 14 ++--- src/web/yarn.lock | 14 ++--- 7 files changed, 97 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f7be6de..a7d788b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -32,9 +32,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.58" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "arrayref" @@ -56,15 +56,16 @@ checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" [[package]] name = "async-graphql" -version = "4.0.4" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffffea596a12b6d9ea5c6fc8a5f414cf4e0c8cd6b618ac2c3d4f56d9b5c5520b" +checksum = "d9ed522678d412d77effe47b3c82314ac36952a35e6e852093dd48287c421f80" dependencies = [ "async-graphql-derive", "async-graphql-parser", "async-graphql-value", "async-stream", "async-trait", + "base64", "bytes", "fast_chemail", "fnv", @@ -81,6 +82,7 @@ dependencies = [ "regex", "serde", "serde_json", + "serde_urlencoded", "static_assertions", "tempfile", "thiserror", @@ -90,9 +92,9 @@ dependencies = [ [[package]] name = "async-graphql-axum" -version = "4.0.4" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991af23ae3a4fa59288022d03d61d42bbf8e4d78225b6c66421178c2b874027c" +checksum = "c91ac174c05670edffb720bc376b9d4c274c3d127ac08ed3d38144c9415502cd" dependencies = [ "async-graphql", "async-trait", @@ -101,16 +103,15 @@ dependencies = [ "futures-util", "http-body", "serde_json", - "serde_urlencoded", "tokio-util", "tower-service", ] [[package]] name = "async-graphql-derive" -version = "4.0.4" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7082221cc1dc29edec0e3225420146b1fbc7f18ba534e301eab186501ae84c28" +checksum = "c121a894495d7d3fc3d4e15e0a9843e422e4d1d9e3c514d8062a1c94b35b005d" dependencies = [ "Inflector", "async-graphql-parser", @@ -124,9 +125,9 @@ dependencies = [ [[package]] name = "async-graphql-parser" -version = "4.0.4" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c328e2cb0dade64333859f7a7e22c9e19a3767afaad673976a1d855c9bda5ffa" +checksum = "6b6c386f398145c6180206c1869c2279f5a3d45db5be4e0266148c6ac5c6ad68" dependencies = [ "async-graphql-value", "pest", @@ -136,9 +137,9 @@ dependencies = [ [[package]] name = "async-graphql-value" -version = "4.0.4" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "005292494ce718604a0dc1531e5827fe540761e1df44b064085711c5fde70b7c" +checksum = "7a941b499fead4a3fb5392cabf42446566d18c86313f69f2deab69560394d65f" dependencies = [ "bytes", "indexmap", @@ -199,9 +200,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.56" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" +checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" dependencies = [ "proc-macro2", "quote", @@ -216,9 +217,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.5.13" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9496f0c1d1afb7a2af4338bbe1d969cddfead41d87a9fb3aaa6d0bbc7af648" +checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" dependencies = [ "async-trait", "axum-core", @@ -251,9 +252,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f44a0e6200e9d11a1cdc989e4b358f6e3d354fbf48478f345a17f4e43f8635" +checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" dependencies = [ "async-trait", "bytes", @@ -261,13 +262,15 @@ dependencies = [ "http", "http-body", "mime", + "tower-layer", + "tower-service", ] [[package]] name = "axum-extra" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277c75e6c814b061ae4947d02335d9659db9771b9950cca670002ae986372f44" +checksum = "69034b3b0fd97923eee2ce8a47540edb21e07f48f87f67d44bb4271cec622bdb" dependencies = [ "axum", "bytes", @@ -1045,19 +1048,43 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "opentelemetry" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "futures-channel", + "futures-util", + "indexmap", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" dependencies = [ "async-trait", "crossbeam-channel", "futures-channel", "futures-executor", "futures-util", - "js-sys", - "lazy_static", + "once_cell", + "opentelemetry_api", "percent-encoding", - "pin-project", "rand", "thiserror", ] @@ -1093,10 +1120,11 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pest" -version = "2.1.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" dependencies = [ + "thiserror", "ucd-trie", ] @@ -1410,9 +1438,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" dependencies = [ "itoa", "ryu", @@ -1578,18 +1606,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", @@ -1622,9 +1650,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.0" +version = "1.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" +checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" dependencies = [ "autocfg", "bytes", @@ -1632,7 +1660,6 @@ dependencies = [ "memchr", "mio", "num_cpus", - "once_cell", "parking_lot", "pin-project-lite", "signal-hook-registry", @@ -1922,9 +1949,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" dependencies = [ "getrandom", "rand", diff --git a/Dockerfile b/Dockerfile index 8b6bb84..228be36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-alpine as web_builder +FROM node:19-alpine as web_builder WORKDIR /usr/src/scel/web @@ -7,7 +7,7 @@ COPY src/web/ . RUN --mount=type=cache,target=/usr/src/scel/web/dist yarn RUN --mount=type=cache,target=/usr/src/scel/web/dist yarn build -FROM rust:1.60 as builder +FROM rust:1.64 as builder WORKDIR /usr/src/scel diff --git a/src/cmd/scel/Cargo.toml b/src/cmd/scel/Cargo.toml index 67215d0..06e10c7 100644 --- a/src/cmd/scel/Cargo.toml +++ b/src/cmd/scel/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tokio = { version = "1.0", features = ["full"] } +tokio = { version = "1.21", features = ["full"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } -anyhow = { version = "1.0.58" } +anyhow = { version = "1.0.66" } dotenv = { version = "*" } scel_api = { path = "../../lib/scel_api" } diff --git a/src/lib/scel_api/Cargo.toml b/src/lib/scel_api/Cargo.toml index a032b7b..ebdce53 100644 --- a/src/lib/scel_api/Cargo.toml +++ b/src/lib/scel_api/Cargo.toml @@ -6,22 +6,22 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -axum = { version = "0.5.6" } -axum-extra = { version = "0.3.6", features = ["spa"] } +axum = { version = "0.5.17" } +axum-extra = { version = "0.3.7", features = ["spa"] } futures = "0.3.21" -tower-http = { version = "0.3.3", features = ["cors", "trace"] } -async-graphql = { version = "4.0.0", features = [ +tower-http = { version = "0.3.4", features = ["cors", "trace"] } +async-graphql = { version = "4.0.16", features = [ 'tracing', 'opentelemetry', "log", ] } -async-graphql-axum = { version = "4.0.0" } +async-graphql-axum = { version = "4.0.16" } serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.68" -tokio = { version = "1.0", features = ["full"] } +serde_json = "1.0.87" +tokio = { version = "1.21", features = ["full"] } tracing = "0.1" tracing-subscriber = { version = "0.3" } -anyhow = { version = "1.0.58" } +anyhow = { version = "1.0.66" } oauth2 = { version = "*" } async-session = { version = "*" } reqwest = { version = "*", default-features = false, features = [ diff --git a/src/lib/scel_core/Cargo.toml b/src/lib/scel_core/Cargo.toml index 6802ede..46b5fd5 100644 --- a/src/lib/scel_core/Cargo.toml +++ b/src/lib/scel_core/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tokio = { version = "1.0", features = ["full"] } +tokio = { version = "1.21", features = ["full"] } anyhow = { version = "*" } -async-trait = { version = "0.1.56" } +async-trait = { version = "0.1.58" } futures = "0.3.21" tracing = "0.1" lazy_static = "1.4.0" -regex = { version = "1.5.5" } -thiserror = "1.0.31" -uuid = {version = "1.1.2", features = ["v4", "fast-rng"]} +regex = { version = "1.6.0" } +thiserror = "1.0.37" +uuid = {version = "1.2.1", features = ["v4", "fast-rng"]} diff --git a/src/web/package.json b/src/web/package.json index 741a0c0..378d19c 100644 --- a/src/web/package.json +++ b/src/web/package.json @@ -9,14 +9,14 @@ "preview": "vite preview" }, "dependencies": { - "react": "^18.2.0", - "react-dom": "^18.2.0" + "react": "18.2.0", + "react-dom": "18.2.0" }, "devDependencies": { - "@types/react": "^18.0.15", - "@types/react-dom": "^18.0.6", - "@vitejs/plugin-react": "^2.0.0", - "typescript": "^4.6.4", - "vite": "^3.0.0" + "@types/react": "18.0.15", + "@types/react-dom": "18.0.6", + "@vitejs/plugin-react": "2.0.0", + "typescript": "4.7.4", + "vite": "3.0.2" } } \ No newline at end of file diff --git a/src/web/yarn.lock b/src/web/yarn.lock index a769db9..253630e 100644 --- a/src/web/yarn.lock +++ b/src/web/yarn.lock @@ -279,14 +279,14 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== -"@types/react-dom@^18.0.6": +"@types/react-dom@18.0.6": version "18.0.6" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.6.tgz#36652900024842b74607a17786b6662dd1e103a1" integrity sha512-/5OFZgfIPSwy+YuIBP/FgJnQnsxhZhjjrnxudMddeblOouIodEQ75X14Rr4wGSG/bknL+Omy9iWlLo1u/9GzAA== dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.15": +"@types/react@*", "@types/react@18.0.15": version "18.0.15" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.15.tgz#d355644c26832dc27f3e6cbf0c4f4603fc4ab7fe" integrity sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow== @@ -300,7 +300,7 @@ resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== -"@vitejs/plugin-react@^2.0.0": +"@vitejs/plugin-react@2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-2.0.0.tgz#12decd097773a00620e44b780b1d2c00df101449" integrity sha512-zHkRR+X4zqEPNBbKV2FvWSxK7Q6crjMBVIAYroSU8Nbb4M3E5x4qOiLoqJBHtXgr27kfednXjkwr3lr8jS6Wrw== @@ -618,7 +618,7 @@ postcss@^8.4.14: picocolors "^1.0.0" source-map-js "^1.0.2" -react-dom@^18.2.0: +react-dom@18.2.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== @@ -631,7 +631,7 @@ react-refresh@^0.14.0: resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e" integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ== -react@^18.2.0: +react@18.2.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== @@ -698,7 +698,7 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== -typescript@^4.6.4: +typescript@4.7.4: version "4.7.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== @@ -711,7 +711,7 @@ update-browserslist-db@^1.0.4: escalade "^3.1.1" picocolors "^1.0.0" -vite@^3.0.0: +vite@3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.2.tgz#2a7b4642c53ae066cf724e7e581d6c1fd24e2c32" integrity sha512-TAqydxW/w0U5AoL5AsD9DApTvGb2iNbGs3sN4u2VdT1GFkQVUfgUldt+t08TZgi23uIauh1TUOQJALduo9GXqw== -- 2.45.2 From 4df964f023d8402c30181ac91cddb07abee12db5 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Thu, 27 Oct 2022 22:14:58 +0200 Subject: [PATCH 2/2] only push --- .drone.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3a9f1c5..95efe75 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,13 +9,18 @@ steps: settings: username: kasperhermansen password: - from_secret: - docker_secret + from_secret: docker_secret repo: kasperhermansen/scel tags: latest context: . dockerfile: Dockerfile cache_from: kasperhermansen/scel:latest + when: + event: + include: + - push + - tag + - promote - name: send telegram notification image: appleboy/drone-telegram @@ -26,4 +31,3 @@ steps: format: markdown when: status: [failure] - -- 2.45.2