Fix seed envvar export for ci

desci-labs · Dec 14, 2023 · cd0a658 · cd0a658
1 parent 075a966
commit cd0a658
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/packages/composedb/Makefile b/packages/composedb/Makefile
@@ -1,4 +1,4 @@
-.PHONY: clean clean-test start-test-env kill-test-env
+.PHONY: generate clean clean-test start-test-env kill-test-env
 
 generate:
 	npm run generate
@@ -19,6 +19,9 @@ start-test-env: clean-test generate
 	npx ceramic daemon --config test.config.json &>/dev/null &
 	sleep 5
 
+	echo "[DEBUG] Finding admin_seed relative to $$PWD:"
+	find ../.. -name admin_seed.txt
+	echo "Content: $$(cat admin_seed.txt)"
 	npm run deployComposites
 
 kill-test-env:

diff --git a/packages/composedb/package.json b/packages/composedb/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "generate": "node --no-warnings=ExperimentalWarning --loader ts-node/esm scripts/generate.ts",
     "dev": "node --no-warnings=ExperimentalWarning --loader ts-node/esm scripts/run.ts",
-    "deployComposites": "ADMIN_SEED=$(<admin_seed.txt) node --no-warnings=ExperimentalWarning --loader ts-node/esm scripts/composites.ts",
+    "deployComposites": "export ADMIN_SEED=$(cat admin_seed.txt) && echo \"[DEBUG] seed from deployComposites: $ADMIN_SEED \n [DEBUG] content: $(cat admin_seed.txt) \" && node --no-warnings=ExperimentalWarning --loader ts-node/esm scripts/composites.ts",
     "ceramic": "ceramic daemon --config composedb.config.json",
     "kill": "pkill --full \"ceramic daemon|ipfs daemon\""
   },

diff --git a/packages/composedb/scripts/composites.ts b/packages/composedb/scripts/composites.ts
@@ -202,6 +202,12 @@ const runAsScript =
 
 if (runAsScript) {
   const seed = process.env.ADMIN_SEED;
-  if (!seed) throw new Error("No ADMIN_SEED environment variable set!");
+  if (!seed) {
+    console.log(
+      "[DEBUG] could not find ADMIN_SEED, dumping env:\n",
+      JSON.stringify(process.env, undefined, 2),
+    );
+    throw new Error("No ADMIN_SEED environment variable set!");
+  }
   await writeComposite(seed);
 }
diff --git a/packages/composedb/scripts/generate.ts b/packages/composedb/scripts/generate.ts
@@ -66,7 +66,7 @@ export const Generate = async () => {
   };
 
   if (!existsSync(SEED_PATH)) {
-    console.log("Creating new admin seed...");
+    console.log(`Creating new admin seed at ${SEED_PATH}...`);
     writeFileSync(SEED_PATH, newSeed());
 
     console.log("Generating new config...");

diff --git a/packages/composedb/src/__generated__/definition.js b/packages/composedb/src/__generated__/definition.js
diff --git a/packages/composedb/src/__generated__/definition.json b/packages/composedb/src/__generated__/definition.json
diff --git a/packages/lib/package.json b/packages/lib/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "build": "rm -rf ./dist && tsc --project tsconfig.build.json",
     "populate": "node --no-warnings=ExperimentalWarning --loader ts-node/esm scripts/populate.ts",
-    "test": "ADMIN_SEED=$(<../composedb/admin_seed.txt) vitest --run --config vitest.config.ts"
+    "test": "export ADMIN_SEED=$(<../composedb/admin_seed.txt) && vitest --run --config vitest.config.ts"
   },
   "devDependencies": {
     "ts-node": "^10.9.1",