Merge branch 'master' into nymkappa/ignore-nega-usd-price
This commit is contained in:
		
						commit
						2c55182cf0
					
				
							
								
								
									
										3
									
								
								.github/workflows/cypress.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/cypress.yml
									
									
									
									
										vendored
									
									
								
							| @ -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/')" | ||||||
|  | |||||||
| @ -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); | ||||||
|     } |     } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user