Fix build
This commit is contained in:
parent
76104accda
commit
e7ce225558
|
@ -773,7 +773,6 @@ void State::run(BuildID buildOne)
|
|||
_destStore = openLocalBinaryCacheStore(
|
||||
_localStore,
|
||||
hydraConfig["binary_cache_secret_key_file"],
|
||||
hydraConfig["binary_cache_public_key_file"],
|
||||
dir);
|
||||
}
|
||||
|
||||
|
@ -784,7 +783,6 @@ void State::run(BuildID buildOne)
|
|||
auto store = make_ref<S3BinaryCacheStore>(
|
||||
_localStore,
|
||||
hydraConfig["binary_cache_secret_key_file"],
|
||||
hydraConfig["binary_cache_public_key_file"],
|
||||
bucketName);
|
||||
store->init();
|
||||
_destStore = std::shared_ptr<S3BinaryCacheStore>(store);
|
||||
|
|
|
@ -32,9 +32,8 @@ R && checkAws(const FormatOrString & fs, Aws::Utils::Outcome<R, E> && outcome)
|
|||
}
|
||||
|
||||
S3BinaryCacheStore::S3BinaryCacheStore(std::shared_ptr<Store> localStore,
|
||||
const Path & secretKeyFile, const Path & publicKeyFile,
|
||||
const std::string & bucketName)
|
||||
: BinaryCacheStore(localStore, secretKeyFile, publicKeyFile)
|
||||
const Path & secretKeyFile, const std::string & bucketName)
|
||||
: BinaryCacheStore(localStore, secretKeyFile)
|
||||
, bucketName(bucketName)
|
||||
, config(makeConfig())
|
||||
, client(make_ref<Aws::S3::S3Client>(*config))
|
||||
|
@ -177,4 +176,3 @@ std::string S3BinaryCacheStore::getFile(const std::string & path)
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -21,8 +21,7 @@ private:
|
|||
public:
|
||||
|
||||
S3BinaryCacheStore(std::shared_ptr<Store> localStore,
|
||||
const Path & secretKeyFile, const Path & publicKeyFile,
|
||||
const std::string & bucketName);
|
||||
const Path & secretKeyFile, const std::string & bucketName);
|
||||
|
||||
void init() override;
|
||||
|
||||
|
|
Loading…
Reference in a new issue