Compare commits

..

1 Commits

Author SHA1 Message Date
e810204400 fix(deps): update all dependencies
Some checks reported errors
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build was killed
2025-02-18 01:32:09 +00:00
6 changed files with 384 additions and 523 deletions

836
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -3,7 +3,7 @@ members = ["crates/*", "ci"]
resolver = "2" resolver = "2"
[workspace.dependencies] [workspace.dependencies]
dagger-sdk = "0.18.3"
anyhow = { version = "1.0.85" } anyhow = { version = "1.0.85" }
tokio = { version = "1", features = ["full"] } tokio = { version = "1", features = ["full"] }
tracing = { version = "0.1", features = ["log"] } tracing = { version = "0.1", features = ["log"] }

View File

@@ -5,9 +5,9 @@ edition = "2021"
[dependencies] [dependencies]
tokio.workspace = true tokio.workspace = true
dagger-sdk.workspace = true
eyre = { version = "0.6" } dagger-sdk = "0.15.0"
eyre = { version = "0.6.12" }
dagger-components = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" } dagger-components = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" }
dagger-rust = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" } dagger-rust = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" }

View File

@@ -5,13 +5,13 @@ edition = "2021"
[dependencies] [dependencies]
tokio.workspace = true tokio.workspace = true
dagger-sdk.workspace = true
eyre = { version = "0.6" } dagger-sdk = "0.15.0"
eyre = { version = "0.6.12" }
dagger-components = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" } dagger-components = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" }
dagger-rust = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" } dagger-rust = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" }
cuddle-ci = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" } cuddle-ci = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" }
async-trait = "0.1" async-trait = "0.1.80"
tracing.workspace = true tracing.workspace = true
tracing-subscriber.workspace = true tracing-subscriber.workspace = true

View File

@@ -16,13 +16,7 @@ async fn main() -> eyre::Result<()> {
let service = &RustService::from(client.clone()) let service = &RustService::from(client.clone())
.with_arch(Architecture::Amd64) .with_arch(Architecture::Amd64)
.with_os(Os::Linux) .with_os(Os::Linux)
.with_apt(&[ .with_apt(&["libssl-dev", "libz-dev", "libpq-dev", "protobuf-compiler"])
"libssl-dev",
"libz-dev",
"libpq-dev",
"protobuf-compiler",
"cmake",
])
.with_apt_release(&["libssl-dev", "libz-dev", "libpq-dev"]) .with_apt_release(&["libssl-dev", "libz-dev", "libpq-dev"])
.with_cuddle_file(&cuddle_file) .with_cuddle_file(&cuddle_file)
.with_apt_ca_certificates() .with_apt_ca_certificates()
@@ -83,17 +77,6 @@ impl cuddle_ci::ReleaseAction for RustReleaser {
rust_image rust_image
.with_workdir("/mnt/src") .with_workdir("/mnt/src")
.with_exec(vec!["apt", "update"])
.with_exec(vec![
"apt",
"install",
"-y",
"libssl-dev",
"libz-dev",
"libpq-dev",
"protobuf-compiler",
"cmake",
])
.with_directory("/mnt/src", src) .with_directory("/mnt/src", src)
.with_new_file( .with_new_file(
"/root/.cargo/credentials", "/root/.cargo/credentials",

View File

@@ -44,16 +44,30 @@ steps:
DRONE_USER: "kjuulh" DRONE_USER: "kjuulh"
DRONE_TOKEN: DRONE_TOKEN:
from_secret: drone_token from_secret: drone_token
REGISTRY_CACHE_USERNAME:
from_secret: registry_cache_username
REGISTRY_CACHE_PASSWORD:
from_secret: registry_cache_password
REGISTRY_CACHE_TOKEN:
from_secret: registry_cache_token
REGISTRY_CACHE_url:
from_secret: registry_cache_url
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
DOCKER_PASSWORD: DOCKER_PASSWORD:
from_secret: docker_password from_secret: docker_password
DOCKER_USERNAME: DOCKER_USERNAME:
from_secret: docker_username from_secret: docker_username
CUDDLE_SECRETS_PROVIDER: 1password
CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
CUDDLE_SSH_AGENT: "true" CUDDLE_SSH_AGENT: "true"
GIT_PASSWORD:
from_secret: git_password
CI_PREFIX: "/mnt/ci/ci" CI_PREFIX: "/mnt/ci/ci"
DOCKER_HOST: "tcp://192.168.1.155:2376" DOCKER_HOST: "tcp://192.168.1.155:2376"
CUDDLE_PLEASE_TOKEN: CUDDLE_PLEASE_TOKEN:
from_secret: cuddle_please_token from_secret: cuddle_please_token
OP_SERVICE_ACCOUNT_TOKEN:
from_secret: op_service_account_token
when: when:
event: event:
- pull_request - pull_request
@@ -82,16 +96,30 @@ steps:
DRONE_USER: "kjuulh" DRONE_USER: "kjuulh"
DRONE_TOKEN: DRONE_TOKEN:
from_secret: drone_token from_secret: drone_token
REGISTRY_CACHE_USERNAME:
from_secret: registry_cache_username
REGISTRY_CACHE_PASSWORD:
from_secret: registry_cache_password
REGISTRY_CACHE_TOKEN:
from_secret: registry_cache_token
REGISTRY_CACHE_url:
from_secret: registry_cache_url
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
DOCKER_PASSWORD: DOCKER_PASSWORD:
from_secret: docker_password from_secret: docker_password
DOCKER_USERNAME: DOCKER_USERNAME:
from_secret: docker_username from_secret: docker_username
CUDDLE_SECRETS_PROVIDER: 1password
CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
CUDDLE_SSH_AGENT: "true" CUDDLE_SSH_AGENT: "true"
GIT_PASSWORD:
from_secret: git_password
CI_PREFIX: "/mnt/ci/ci" CI_PREFIX: "/mnt/ci/ci"
DOCKER_HOST: "tcp://192.168.1.155:2376" DOCKER_HOST: "tcp://192.168.1.155:2376"
CUDDLE_PLEASE_TOKEN: CUDDLE_PLEASE_TOKEN:
from_secret: cuddle_please_token from_secret: cuddle_please_token
OP_SERVICE_ACCOUNT_TOKEN:
from_secret: op_service_account_token
when: when:
event: event:
- push - push
@@ -122,11 +150,21 @@ steps:
DRONE_USER: "kjuulh" DRONE_USER: "kjuulh"
DRONE_TOKEN: DRONE_TOKEN:
from_secret: drone_token from_secret: drone_token
REGISTRY_CACHE_USERNAME:
from_secret: registry_cache_username
REGISTRY_CACHE_PASSWORD:
from_secret: registry_cache_password
REGISTRY_CACHE_TOKEN:
from_secret: registry_cache_token
REGISTRY_CACHE_url:
from_secret: registry_cache_url
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
DOCKER_PASSWORD: DOCKER_PASSWORD:
from_secret: docker_password from_secret: docker_password
DOCKER_USERNAME: DOCKER_USERNAME:
from_secret: docker_username from_secret: docker_username
CUDDLE_SECRETS_PROVIDER: 1password
CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
CUDDLE_SSH_AGENT: "true" CUDDLE_SSH_AGENT: "true"
GIT_PASSWORD: GIT_PASSWORD:
from_secret: git_password from_secret: git_password
@@ -136,6 +174,8 @@ steps:
from_secret: cuddle_please_token from_secret: cuddle_please_token
CRATES_IO_TOKEN: CRATES_IO_TOKEN:
from_secret: crate_io_token from_secret: crate_io_token
OP_SERVICE_ACCOUNT_TOKEN:
from_secret: op_service_account_token
when: when:
ref: ref:
- refs/tags/v* - refs/tags/v*