machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into nymkappa/unify-blocks-apis

Browse Source
This commit is contained in:
wiz 2023-03-01 18:19:45 +09:00 committed by GitHub
commit e2ef8721d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/cypress.yml vendored
View File

@ -1,8 +1,11 @@
name: Cypress Tests name: Cypress Tests
on: on:
push:
branches: [master]
pull_request: pull_request:
types: [opened, review_requested, synchronize] types: [opened, review_requested, synchronize]
jobs: jobs:
cypress: cypress:
if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')" if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"

2
backend/src/api/database-migration.ts
View File

@ -501,7 +501,7 @@ class DatabaseMigration {
await this.updateToSchemaVersion(56); await this.updateToSchemaVersion(56);
} }
if (databaseSchemaVersion < 57) { if (databaseSchemaVersion < 57 && isBitcoin === true) {
await this.$executeQuery(`ALTER TABLE nodes MODIFY updated_at datetime NULL`); await this.$executeQuery(`ALTER TABLE nodes MODIFY updated_at datetime NULL`);
await this.updateToSchemaVersion(57); await this.updateToSchemaVersion(57);
} }