From 26c1c083def96ae02b864c426766d483bc412c31 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Thu, 27 Jul 2023 15:50:58 +0200 Subject: [PATCH 1/3] feat: with extra context Signed-off-by: kjuulh --- cuddle_cli/src/context.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cuddle_cli/src/context.rs b/cuddle_cli/src/context.rs index 550ba83..589a154 100644 --- a/cuddle_cli/src/context.rs +++ b/cuddle_cli/src/context.rs @@ -6,6 +6,7 @@ use std::{ sync::{Arc, Mutex}, }; +use anyhow::Context; use git2::{ build::{CheckoutBuilder, RepoBuilder}, FetchOptions, RemoteCallbacks, @@ -133,6 +134,8 @@ fn pull_parent_cuddle_into_local( } }); + rc.certificate_check(|_cert, _something| Ok(git2::CertificateCheckStatus::CertificateOk)); + let mut fo = FetchOptions::new(); fo.remote_callbacks(rc); From 4bd4648a94db9124bdc99573c70361ee12b42ee1 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Thu, 27 Jul 2023 15:53:45 +0200 Subject: [PATCH 2/3] feat: clean up drone Signed-off-by: kjuulh --- .drone.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7b0b118..8d44e1d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,16 +32,11 @@ steps: - cuddle x build_cuddle_image environment: DOCKER_BUILDKIT: 1 - DOCKER_USERNAME: - from_secret: docker_username - DOCKER_PASSWORD: - from_secret: docker_password CUDDLE_SECRETS_PROVIDER: 1password CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci" CUDDLE_SSH_AGENT: "true" OP_SERVICE_ACCOUNT_TOKEN: from_secret: op_service_account_token - GIT_SSH_COMMAND: "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" depends_on: - "load_secret" From ae74427ca8c90a940364ae4011780ddb21e75905 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Thu, 27 Jul 2023 15:57:13 +0200 Subject: [PATCH 3/3] feat: remove cat Signed-off-by: kjuulh --- .drone.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8d44e1d..4d1e489 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,8 +14,6 @@ steps: commands: - mkdir -p $HOME/.ssh/ - echo "$SSH_KEY" | base64 -d > $HOME/.ssh/id_ed25519 - - ls $HOME/.ssh/ - - cat $HOME/.ssh/id_ed25519 - name: build image: kasperhermansen/cuddle:latest