From 3c62a1e32b7d8428bbe37c88a60b34cf06b0566a Mon Sep 17 00:00:00 2001 From: Jason Hawk Harris Date: Fri, 11 Nov 2022 12:02:41 -0600 Subject: [PATCH 1/2] Update p4 to 1.12 - reference issue: #44030 --- cmd/gitserver/p4-fusion-install-alpine.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/gitserver/p4-fusion-install-alpine.sh b/cmd/gitserver/p4-fusion-install-alpine.sh index 0621980f7722..8f73a2fe5684 100755 --- a/cmd/gitserver/p4-fusion-install-alpine.sh +++ b/cmd/gitserver/p4-fusion-install-alpine.sh @@ -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" @@ -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 < Date: Fri, 18 Nov 2022 07:52:49 -0600 Subject: [PATCH 2/2] Add note for p4-fusion update to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65ca1994258d..91ebf9f54cdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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/d1d460f6-e70f-b17f-73a5-e56d604dd9d5@github.com/. [#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