NOMERGE: 6.5.5 release

go/chat/s3/s3.go

@@ -572,9 +572,10 @@ func (b *Bucket) Del(ctx context.Context, path string) error {
 	b.addTokenHeader(headers)
 
 	req := &request{
-		method: "DELETE",
-		bucket: b.Name,
-		path:   path,
+		method:  "DELETE",
+		bucket:  b.Name,
+		path:    path,
+		headers: headers,
 	}
 	return b.S3.query(ctx, req, nil)
 }

go/libkb/version.go

@@ -4,4 +4,4 @@
 package libkb
 
 // Version is the current version (should be MAJOR.MINOR.PATCH)
-const Version = "6.5.4"
+const Version = "6.5.5"

packaging/build_darwin.sh

@@ -3,10 +3,31 @@
 gopath=${GOPATH:-}
 client_dir="$gopath/src/github.com/keybase/client"
 
-"$client_dir/packaging/slack/send.sh" "Starting darwin build"
-ARCH="amd64" PLATFORM="darwin" "$client_dir/packaging/prerelease/pull_build.sh"
-# NOTE: We build the arm64 version second to get a later timestamp, so it will
-# be presented as a later version to your updater. This allows the one-time
-# upgrading from the x86 build to the arm64 one.
-"$client_dir/packaging/slack/send.sh" "Starting darwin-arm64 build"
-ARCH="arm64" PLATFORM="darwin-arm64" "$client_dir/packaging/prerelease/pull_build.sh"
+if [[ -n "${ARCH:-}" ]]; then
+  # If ARCH is specified, only build that one
+  if [[ "$ARCH" == "amd64" ]]; then
+    "$client_dir/packaging/slack/send.sh" "Starting darwin build"
+    ARCH="amd64" PLATFORM="darwin" "$client_dir/packaging/prerelease/pull_build.sh"
+  elif [[ "$ARCH" == "arm64" ]]; then
+    "$client_dir/packaging/slack/send.sh" "Starting darwin-arm64 build"
+    ARCH="arm64" PLATFORM="darwin-arm64" "$client_dir/packaging/prerelease/pull_build.sh"
+  else
+    echo "Unknown ARCH: $ARCH (expected amd64 or arm64)"
+    exit 1
+  fi
+else
+  # Build both architectures
+  "$client_dir/packaging/slack/send.sh" "Starting darwin build"
+  ARCH="amd64" PLATFORM="darwin" "$client_dir/packaging/prerelease/pull_build.sh"
+
+  # Clean repo between arch builds
+  echo "Cleaning repo..."
+  cd "$client_dir" && git reset --hard && git clean -fd
+  git status
+
+  # NOTE: We build the arm64 version second to get a later timestamp, so it will
+  # be presented as a later version to your updater. This allows the one-time
+  # upgrading from the x86 build to the arm64 one.
+  "$client_dir/packaging/slack/send.sh" "Starting darwin-arm64 build"
+  ARCH="arm64" PLATFORM="darwin-arm64" "$client_dir/packaging/prerelease/pull_build.sh"
+fi

shared/android/app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: "com.facebook.react"
 apply plugin: 'com.github.triplet.play'
 
 // KB: app version
-def VERSION_NAME = "6.5.4"
+def VERSION_NAME = "6.5.5"
 
 // KB: Number of commits, like ios
 Integer getVersionCode() {

shared/chat/blocking/block-modal/container.tsx

@@ -1,7 +1,7 @@
 import * as C from '@/constants'
 import * as Constants from '@/constants/users'
 import * as React from 'react'
-import BlockModal, {type BlockModalContext, type BlockType, type NewBlocksMap, type ReportSettings} from '.'
+import BlockModal, { type BlockModalContext, type BlockType, type NewBlocksMap, type ReportSettings } from '.'
 
 type OwnProps = {
   blockUserByDefault?: boolean
@@ -16,7 +16,7 @@ type OwnProps = {
 }
 
 const Container = (ownProps: OwnProps) => {
-  const {context, conversationIDKey} = ownProps
+  const { context, conversationIDKey } = ownProps
   const teamname = ownProps.team
   const blockUserByDefault = ownProps.blockUserByDefault ?? false
   const filterUserByDefault = ownProps.filterUserByDefault ?? false
@@ -39,7 +39,7 @@ const Container = (ownProps: OwnProps) => {
     adderUsername,
     blockUserByDefault,
     context,
-    conversationIDKey,
+    convID: conversationIDKey,
     filterUserByDefault,
     finishWaiting: waitingForLeave || waitingForBlocking || waitingForReport,
     flagUserByDefault,
@@ -104,11 +104,11 @@ const Container = (ownProps: OwnProps) => {
     onFinish: (newBlocks: NewBlocksMap, blockTeam: boolean) => {
       let takingAction = false
       if (blockTeam) {
-        const {teamname} = stateProps
+        const { teamname } = stateProps
         if (teamname) {
           takingAction = true
           leaveTeamAndBlock(teamname)
-        } else if (stateProps.conversationIDKey) {
+        } else if (stateProps.convID) {
           takingAction = true
           const anyReported = [...newBlocks.values()].some(v => v.report !== undefined)
           setConversationStatus(anyReported)
@@ -119,7 +119,7 @@ const Container = (ownProps: OwnProps) => {
         setUserBlocks(newBlocks)
       }
       newBlocks.forEach(
-        ({report}, username) => report && reportUser(username, stateProps.conversationIDKey, report)
+        ({ report }, username) => report && reportUser(username, stateProps.convID, report)
       )
       if (!takingAction) {
         onClose()

shared/chat/blocking/block-modal/page.tsx

@@ -5,10 +5,9 @@ const Block = React.lazy(async () => import('./container'))
 type OwnProps = C.Chat.ChatProviderProps<C.ViewPropsToPageProps<typeof Block>>
 
 const Screen = (p: OwnProps) => {
-  const {conversationIDKey, ...rest} = p.route.params
   return (
     <C.Chat.ProviderScreen rp={p} canBeNull={true}>
-      <Block {...rest} />
+      <Block {...p.route.params} />
     </C.Chat.ProviderScreen>
   )
 }

shared/desktop/CHANGELOG.txt

@@ -1,3 +1,2 @@
-macOS:
-
-• Fix the KBFS mount to work on macOS 26 (Tahoe).
+• Fix minor chat bugs.
+• Fix option to include transcripts on chat reports.

shared/ios/Keybase/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.5.4</string>
+	<string>6.5.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

shared/ios/KeybaseShare/Info.plist

@@ -17,7 +17,7 @@
         <key>CFBundlePackageType</key>
         <string>XPC!</string>
         <key>CFBundleShortVersionString</key>
-        <string>6.5.4</string>
+        <string>6.5.5</string>
         <key>CFBundleVersion</key>
         <string>1</string>
         <key>NSExtension</key>