feat(ci): macos, fix keysetcache use

This commit is contained in:
rudy
2022-04-25 09:29:14 +02:00
committed by rudy-6-4
parent 843dd0eb5b
commit b45e469a44
4 changed files with 6 additions and 2 deletions

View File

@@ -276,7 +276,7 @@ jobs:
if: github.event_name == 'push'
run: |
cd compiler
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} make keysetcache_ci_populated
KEYSETCACHECI="$TMPDIR/KeySetCache" GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} make keysetcache_ci_populated
- name: Test
if: github.event_name == 'push'

View File

@@ -9,7 +9,7 @@ CONCRETE_OPTIMIZER_DIR ?= .dependencies/concrete-optimizer
CONCRETE_OPTIMIZER_BRANCH ?= master
KEYSETCACHEDEV=/tmp/KeySetCache
KEYSETCACHECI=../KeySetCache
KEYSETCACHECI ?= ../KeySetCache
export PATH := $(BUILD_DIR)/bin:$(PATH)

View File

@@ -237,6 +237,7 @@ KeySetCache::loadOrGenerateSave(ClientParameters &params, uint64_t seed_msb,
return loadKeys(params, seed_msb, seed_lsb, std::string(folderPath));
}
std::cerr << "KeySetCache: miss, regenerating \n";
OUTCOME_TRY(auto key_set, KeySet::generate(params, seed_msb, seed_lsb));
OUTCOME_TRYV(saveKeys(*key_set, folderPath));

View File

@@ -114,6 +114,9 @@ getTestKeySetCache() {
llvm::sys::path::append(cachePath, "KeySetCache");
auto cachePathStr = std::string(cachePath);
std::cout << "Using KeySetCache dir: " << cachePathStr << "\n";
return llvm::Optional<concretelang::clientlib::KeySetCache>(
concretelang::clientlib::KeySetCache(cachePathStr));
}