FIXUP

cardano-foundation · Aug 4, 2024 · 8d1befb · 8d1befb
1 parent d25ff55
commit 8d1befb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -143,9 +143,16 @@ steps:
       concurrency: 1
       concurrency_group: 'linux-e2e-tests'
 
-    - label: Private Network Full Sync
+    - label: Build .#cardano-wallet (linux)
+      key: cardano-wallet
       depends_on: linux-nix
-      timeout: 20
+      command: 'nix build .#cardano-wallet'
+      agents:
+        system: ${linux}
+
+    - label: Private Network Full Sync
+      depends_on: cardano-wallet
+      timeout: 10
       command: |
         rm -rf run/private/nix/logs
         mkdir -p run/private/nix/logs
@@ -162,11 +169,8 @@ steps:
         NETWORK: testnet
 
     - label: Mainnet Boot Sync
-      depends_on: linux-nix
-      timeout: 5
-      retry:
-        automatic:
-          limit: 3
+      depends_on: cardano-wallet
+      timeout: 2
       command: |
         cd run/mainnet/nix
         rm -rf logs
@@ -186,14 +190,14 @@ steps:
 
     - block: Sanchonet Full Sync
       if: build.env("RELEASE_CANDIDATE") == null
-      depends_on: linux-nix
+      depends_on: cardano-wallet
       key: linux-sanchonet-full-sync-block
 
     - label: Sanchonet Full Sync
       depends_on:
-        - linux-nix
+        - cardano-wallet
         - linux-sanchonet-full-sync-block
-      timeout_in_minutes: 240
+      timeout_in_minutes: 30
       command: |
         rm -rf run/sanchonet/nix/logs
         mkdir -p run/sanchonet/nix/logs
@@ -216,9 +220,9 @@ steps:
 
     - label: Preprod Full Sync
       depends_on:
-        - linux-nix
+        - cardano-wallet
         - linux-preprod-full-sync-block
-      timeout_in_minutes: 240
+      timeout_in_minutes: 30
       command: |
         cd run/preprod/nix
         rm -rf logs

diff --git a/lib/exe/lib/Cardano/Wallet/Application/CLI.hs b/lib/exe/lib/Cardano/Wallet/Application/CLI.hs
@@ -1434,23 +1434,24 @@ listenApiOption =
 -- | [--ui-random-port|--ui-port=INT]
 listenUiOption :: Parser (Maybe Listen)
 listenUiOption =
-    optional $ (ListenOnPort . getPort <$> uiPortOption)
+    (Just ListenOnRandomPort <$ uiRandomPortOption)
     <|>
-    (ListenOnRandomPort <$ uiRandomPortOption)
+    (Just . ListenOnPort . getPort <$> uiPortOption)
+    <|>
+    pure Nothing
 
 -- | [--ui-random-port]
 uiRandomPortOption :: Parser Bool
 uiRandomPortOption = flag' False $ mempty
     <> long "ui-random-port"
     <> help "serve the wallet UI on any available port (conflicts with --ui-port)"
 
--- | [--ui-port=INT], default: 8091
+-- | [--ui-port=INT]
 uiPortOption :: Parser (Port "Wallet UI")
 uiPortOption = optionT $ mempty
     <> long "ui-port"
     <> metavar "INT"
     <> help "port used for serving the wallet UI."
-    <> value (Port 8_091)
     <> showDefaultWith showT
 
 -- | [--random-port]