Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 4659ba8

Browse files
Update p4 to 1.12 (#44301)
* Update p4 to 1.12 - reference issue: #44030 * Add note for p4-fusion update to changelog Co-authored-by: Ryan Slade <[email protected]>
1 parent 94926d5 commit 4659ba8

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ All notable changes to Sourcegraph are documented in this file.
6060

6161
- Updated minimum required version of `git` to 2.38.1 in `gitserver` and `server` Docker image. This addresses: https://github.blog/2022-04-12-git-security-vulnerability-announced/ and https://lore.kernel.org/git/[email protected]/. [#43615](https://github.com/sourcegraph/sourcegraph/pull/43615)
6262
- When a `content:` filter is used in a query, only file contents will be searched (previously any of file contents, paths, or repos were searched). However, as before, if `type:` is also set, the `content:` filter will search for results of the specified `type:`. [#43442](https://github.com/sourcegraph/sourcegraph/pull/43442)
63+
- Updated [p4-fusion](https://github.com/salesforce/p4-fusion) from `1.11` to `1.12`.
6364

6465
### Fixed
6566

cmd/gitserver/p4-fusion-install-alpine.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ set -x
3838
# Then extract the binary from /usr/local/bin/p4-fusion. Please rename it
3939
# follow the format and upload to the bucket here
4040
# https://console.cloud.google.com/storage/browser/sourcegraph-artifacts/p4-fusion
41-
export P4_FUSION_VERSION=v1.11
41+
export P4_FUSION_VERSION=v1.12
4242

4343
# Runtime dependencies
4444
echo "--- p4-fusion apk runtime-deps"
@@ -49,7 +49,7 @@ echo "--- p4-fusion prebuilt binary check"
4949
if wget https://storage.googleapis.com/sourcegraph-artifacts/p4-fusion/p4-fusion-"$P4_FUSION_VERSION"-musl-x86_64; then
5050
src=p4-fusion-"$P4_FUSION_VERSION"-musl-x86_64
5151
cat <<EOF | grep "$src" | sha256sum -c
52-
98c4991b40cdd0e0cad2fd5fdbe9f8ff56901415dd1684aed5b4531fc49ab79e p4-fusion-v1.11-musl-x86_64
52+
1b29ef8ba40f88219aece4339bfaf1b2c1722dd4875ba29d19a6fb0c86e12145 p4-fusion-v1.12-musl-x86_64
5353
EOF
5454
chmod +x "$src"
5555
mv "$src" /usr/local/bin/p4-fusion

0 commit comments

Comments
 (0)