diff --git a/go/chat/s3/s3.go b/go/chat/s3/s3.go index 3a5ca9ccb10f..01af001a9a5c 100644 --- a/go/chat/s3/s3.go +++ b/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) } diff --git a/go/libkb/version.go b/go/libkb/version.go index 24ee7899e6c1..bee5df51bb7b 100644 --- a/go/libkb/version.go +++ b/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" diff --git a/packaging/build_darwin.sh b/packaging/build_darwin.sh index 6d727d4951ad..bd72b8a88746 100755 --- a/packaging/build_darwin.sh +++ b/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 diff --git a/shared/android/app/build.gradle b/shared/android/app/build.gradle index 553a09cc4c9f..3deb4e917047 100644 --- a/shared/android/app/build.gradle +++ b/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() { diff --git a/shared/chat/blocking/block-modal/container.tsx b/shared/chat/blocking/block-modal/container.tsx index 5128e4aef782..5be7bcf4ff5a 100644 --- a/shared/chat/blocking/block-modal/container.tsx +++ b/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() diff --git a/shared/chat/blocking/block-modal/page.tsx b/shared/chat/blocking/block-modal/page.tsx index dfa892cd2892..1ba152b9c71c 100644 --- a/shared/chat/blocking/block-modal/page.tsx +++ b/shared/chat/blocking/block-modal/page.tsx @@ -5,10 +5,9 @@ const Block = React.lazy(async () => import('./container')) type OwnProps = C.Chat.ChatProviderProps> const Screen = (p: OwnProps) => { - const {conversationIDKey, ...rest} = p.route.params return ( - + ) } diff --git a/shared/desktop/CHANGELOG.txt b/shared/desktop/CHANGELOG.txt index 094f8fefae1f..c324b9cecd95 100644 --- a/shared/desktop/CHANGELOG.txt +++ b/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. diff --git a/shared/ios/Keybase/Info.plist b/shared/ios/Keybase/Info.plist index 7f7298cd6616..301088c3ec14 100644 --- a/shared/ios/Keybase/Info.plist +++ b/shared/ios/Keybase/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 6.5.4 + 6.5.5 CFBundleSignature ???? CFBundleURLTypes diff --git a/shared/ios/KeybaseShare/Info.plist b/shared/ios/KeybaseShare/Info.plist index 2a24cbd21a19..52e577187d25 100644 --- a/shared/ios/KeybaseShare/Info.plist +++ b/shared/ios/KeybaseShare/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 6.5.4 + 6.5.5 CFBundleVersion 1 NSExtension