Merge branch 'main' into renovate/all
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing

This commit is contained in:
Kasper Juul Hermansen 2023-07-27 14:02:36 +00:00
commit 1d83701436
2 changed files with 3 additions and 7 deletions

View File

@ -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
@ -32,16 +30,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"

View File

@ -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);