1.3.15 release fixes. Remove MacOS builds, Azure Devops just does not…

… like building them and cannot find the right tools and libraries.
electrumsv · Jun 17, 2022 · 08fb65d · 08fb65d
1 parent 7a7c4c7
commit 08fb65d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 52 deletions.
diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
@@ -323,45 +323,12 @@ stages:
       inputs:
         artifactName: 'build-documentation'
         targetPath: $(Build.ArtifactStagingDirectory)
-  - job: BuildMacOS10_14
-    dependsOn:
-    - Preparation
-    pool:
-      vmImage: 'macOS-10.15'
-    steps:
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: 3.9
-        addToPath: true
-        architecture: x64
-    - script: |
-        sudo pip3 install --upgrade pip setuptools wheel
-        # Calin's QR reader requires SDK 10.14, which is not available in the default Xcode version.
-        sudo xcode-select -s /Applications/Xcode_10.3.app/Contents/Developer
-        sudo xcodebuild -license accept
-        brew install gettext && brew link gettext --force
-        ./contrib/osx/make_osx
-      enabled: true
-      continueOnError: false
-      failOnStderr: false
-      displayName: 'Build MacOS binaries'
-    - task: CopyFiles@2
-      inputs:
-        contents: dist/?(*.dmg|*.txt)
-        targetFolder: $(Build.ArtifactStagingDirectory)
-        flattenFolders: true
-        OverWrite: true
-    - task: PublishPipelineArtifact@0
-      inputs:
-        artifactName: 'build-macos'
-        targetPath: $(Build.ArtifactStagingDirectory)
   - job: ProcessArtifacts
     pool:
       vmImage: 'ubuntu-latest'
     dependsOn:
       - BuildLinuxBasedWindows
       - BuildSourceArchive
-      - BuildMacOS10_14
       - Preparation
     variables:
       COMMIT_TAG: $[dependencies.Preparation.outputs['exportVars.COMMIT_TAG']]
@@ -381,10 +348,6 @@ stages:
       inputs:
         artifactName: 'build-source'
         targetPath: $(Build.ArtifactStagingDirectory)
-    - task: DownloadPipelineArtifact@0
-      inputs:
-        artifactName: 'build-macos'
-        targetPath: $(Build.ArtifactStagingDirectory)
     - script: |
         cd $(Build.ArtifactStagingDirectory)
         sha256sum * > build-hashes.txt

diff --git a/electrumsv/gui/qt/dialogs.py b/electrumsv/gui/qt/dialogs.py
@@ -133,7 +133,7 @@ def show_named(name, *, parent=None, wallet=None, **kwargs):
         raise ValueError(f'no box with name {name} found')
     return box.result(parent, wallet, **kwargs)
 
-article_uri = "https://electrumsv.io/articles/2022/electrumsv-1_3_14.html"
+article_uri = "https://electrumsv.io/articles/2022/electrumsv-1_3_15.html"
 
 take_care_notice = """
 <span>ElectrumSV is just a Bitcoin SV wallet, it cannot stop you from making bad decisions. Read

diff --git a/electrumsv/wallet.py b/electrumsv/wallet.py
@@ -2233,21 +2233,7 @@ def __init__(self, storage: WalletStorage) -> None:
         self.request_count = 0
         self.response_count = 0
 
-        # 1.3-related database fixups. We cannot put these in the migration as the master branch
-        # with the 1.4 development may have users and we do not want to break the chain of
-        # migration scripts and database versions.
         self.add_wallet_event_row: Optional[WalletEventRow] = None
-        if not len(self._accounts):
-            for wallet_event_row in self.read_wallet_events():
-                if wallet_event_row.event_type == WalletEventType.ACCOUNT_CREATION_HINT:
-                    self.add_wallet_event_row = wallet_event_row
-                    break
-            else:
-                wallet_events = self.create_wallet_events([
-                    WalletEventRow(0, WalletEventType.ACCOUNT_CREATION_HINT, None,
-                        WalletEventFlag.FEATURED | WalletEventFlag.UNREAD, int(time.time()))
-                ])
-                self.add_wallet_event_row = wallet_events[0]
 
     def __str__(self) -> str:
         return f"wallet(path='{self._storage.get_path()}')"
@@ -2916,6 +2902,22 @@ def get_request_response_counts(self) -> Tuple[int, int]:
 
     def start(self, network: Optional['Network']) -> None:
         self._network = network
+
+        # 1.3-related database fixups. We cannot put these in the migration as the master branch
+        # with the 1.4 development may have users and we do not want to break the chain of
+        # migration scripts and database versions.
+        if not len(self._accounts):
+            for wallet_event_row in self.read_wallet_events():
+                if wallet_event_row.event_type == WalletEventType.ACCOUNT_CREATION_HINT:
+                    self.add_wallet_event_row = wallet_event_row
+                    break
+            else:
+                wallet_events = self.create_wallet_events([
+                    WalletEventRow(0, WalletEventType.ACCOUNT_CREATION_HINT, None,
+                        WalletEventFlag.FEATURED | WalletEventFlag.UNREAD, int(time.time()))
+                ])
+                self.add_wallet_event_row = wallet_events[0]
+
         if network is not None:
             network.add_wallet(self)
         for account in self.get_accounts():