Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ All notable changes to Sourcegraph are documented in this file.

- 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)
- 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)
- Updated [p4-fusion](https://github.com/salesforce/p4-fusion) from `1.11` to `1.12`.

### Fixed

Expand Down
4 changes: 2 additions & 2 deletions cmd/gitserver/p4-fusion-install-alpine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ set -x
# Then extract the binary from /usr/local/bin/p4-fusion. Please rename it
# follow the format and upload to the bucket here
# https://console.cloud.google.com/storage/browser/sourcegraph-artifacts/p4-fusion
export P4_FUSION_VERSION=v1.11
export P4_FUSION_VERSION=v1.12

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