Merge branch 'main' into renovate/all
This commit is contained in:
commit
1d83701436
@ -14,8 +14,6 @@ steps:
|
|||||||
commands:
|
commands:
|
||||||
- mkdir -p $HOME/.ssh/
|
- mkdir -p $HOME/.ssh/
|
||||||
- echo "$SSH_KEY" | base64 -d > $HOME/.ssh/id_ed25519
|
- echo "$SSH_KEY" | base64 -d > $HOME/.ssh/id_ed25519
|
||||||
- ls $HOME/.ssh/
|
|
||||||
- cat $HOME/.ssh/id_ed25519
|
|
||||||
|
|
||||||
- name: build
|
- name: build
|
||||||
image: kasperhermansen/cuddle:latest
|
image: kasperhermansen/cuddle:latest
|
||||||
@ -32,16 +30,11 @@ steps:
|
|||||||
- cuddle x build_cuddle_image
|
- cuddle x build_cuddle_image
|
||||||
environment:
|
environment:
|
||||||
DOCKER_BUILDKIT: 1
|
DOCKER_BUILDKIT: 1
|
||||||
DOCKER_USERNAME:
|
|
||||||
from_secret: docker_username
|
|
||||||
DOCKER_PASSWORD:
|
|
||||||
from_secret: docker_password
|
|
||||||
CUDDLE_SECRETS_PROVIDER: 1password
|
CUDDLE_SECRETS_PROVIDER: 1password
|
||||||
CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
|
CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
|
||||||
CUDDLE_SSH_AGENT: "true"
|
CUDDLE_SSH_AGENT: "true"
|
||||||
OP_SERVICE_ACCOUNT_TOKEN:
|
OP_SERVICE_ACCOUNT_TOKEN:
|
||||||
from_secret: op_service_account_token
|
from_secret: op_service_account_token
|
||||||
GIT_SSH_COMMAND: "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
|
|
||||||
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- "load_secret"
|
- "load_secret"
|
||||||
|
@ -6,6 +6,7 @@ use std::{
|
|||||||
sync::{Arc, Mutex},
|
sync::{Arc, Mutex},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
use anyhow::Context;
|
||||||
use git2::{
|
use git2::{
|
||||||
build::{CheckoutBuilder, RepoBuilder},
|
build::{CheckoutBuilder, RepoBuilder},
|
||||||
FetchOptions, RemoteCallbacks,
|
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();
|
let mut fo = FetchOptions::new();
|
||||||
fo.remote_callbacks(rc);
|
fo.remote_callbacks(rc);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user