Skip to content

Commit 545eb9c

Browse files
committed
Fix Registry CI target and migration tests
1 parent c8925fe commit 545eb9c

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

‎scripts/cellscript_gate.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,12 +385,18 @@ run_website_build_check() {
385385
}
386386

387387
run_registry_api_check() {
388+
local registry_verifier_target_dir="${CARGO_TARGET_DIR:-$ROOT_DIR/services/registry-verifier/target}"
389+
if [[ "$registry_verifier_target_dir" != /* ]]; then
390+
registry_verifier_target_dir="$ROOT_DIR/$registry_verifier_target_dir"
391+
fi
392+
388393
if [[ ! -d services/registry-api/node_modules ]]; then
389394
run npm --prefix services/registry-api ci
390395
fi
391396
run npm --prefix services/registry-api run check
392-
run cargo build --locked --manifest-path services/registry-verifier/Cargo.toml
393-
run env CELLSCRIPT_REGISTRY_VERIFIER_TEST_BINARY="$ROOT_DIR/services/registry-verifier/target/debug/cellscript-registry-verify" \
397+
run cargo build --locked --manifest-path services/registry-verifier/Cargo.toml \
398+
--target-dir "$registry_verifier_target_dir"
399+
run env CELLSCRIPT_REGISTRY_VERIFIER_TEST_BINARY="$registry_verifier_target_dir/debug/cellscript-registry-verify" \
394400
npm --prefix services/registry-api test
395401
run npm --prefix services/registry-api run build
396402
run npm --prefix services/registry-api run build:node

‎services/registry-api/test/sql-registry-store.test.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ describePostgres("SqlRegistryStore PostgreSQL contract", () => {
4242
.filter((file) => /^[0-9]{4}_.+[.]sql$/.test(file))
4343
.sort();
4444
const currentCommitmentMigration = "0007_current_commitment_state.sql";
45-
const sandboxRetentionMigration = "0008_testnet_sandbox_retention.sql";
46-
expect(migrationFiles.at(-1)).toBe(sandboxRetentionMigration);
45+
const authorisationSessionsMigration = "0009_authorisation_sessions.sql";
46+
expect(migrationFiles.at(-1)).toBe(authorisationSessionsMigration);
4747

4848
for (const file of migrationFiles.filter((item) => item < currentCommitmentMigration)) {
4949
await client.query(await readFile(new URL(`../migrations/${file}`, import.meta.url), "utf8"));
@@ -104,7 +104,9 @@ describePostgres("SqlRegistryStore PostgreSQL contract", () => {
104104
where namespace = 'fixture' and name = 'contract' and version = '1.0.0'`,
105105
)).rows[0]?.kind).toBe("on_chain_committed");
106106

107-
await client.query(await readFile(new URL(`../migrations/${sandboxRetentionMigration}`, import.meta.url), "utf8"));
107+
for (const file of migrationFiles.filter((item) => item > currentCommitmentMigration)) {
108+
await client.query(await readFile(new URL(`../migrations/${file}`, import.meta.url), "utf8"));
109+
}
108110

109111
const store = new SqlRegistryStore({ connectionString: scopedConnectionString });
110112
await client.query(`

0 commit comments

Comments
 (0)