Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Follow-up for "ci: upgrade to the latest Azure Pipelines agent pools" #717

Closed

Conversation

dscho
Copy link
Member

@dscho dscho commented Feb 27, 2020

This is a companion patch for #714, adding a patch that would not apply to maint but applies to master. It is intended to be applied on top of the merge that pulls in the agent pool upgrade (which in turn is intended to be applied on top of maint).

Changes since v1:

  • Rebased onto master, as it now has all the building blocks needed for this.

@dscho
Copy link
Member Author

dscho commented Feb 27, 2020

/submit

@gitgitgadget-git
Copy link

@dscho dscho force-pushed the azure-pipelines-latest-pools-test_oid branch from 79ad5ea to 250ffe4 Compare March 4, 2020 11:07
We recently switched to using Perl instead of `sed` in the httpd-based
tests. Let's reflect that in the label we give the corresponding commit
hashes.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho changed the base branch from pu to master March 4, 2020 13:31
@dscho dscho force-pushed the azure-pipelines-latest-pools-test_oid branch from 250ffe4 to a6e4e9c Compare March 4, 2020 13:31
@dscho
Copy link
Member Author

dscho commented Mar 4, 2020

/submit

@gitgitgadget-git
Copy link

@gitgitgadget-git
Copy link

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> We recently switched to using Perl instead of `sed` in the httpd-based
> tests. Let's reflect that in the label we give the corresponding commit
> hashes.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>     Follow-up for "ci: upgrade to the latest Azure Pipelines agent pools"
>     
>     This is a companion patch for https://github.com/git/git/pull/714,
>     adding a patch that would not apply to maint but applies to master. It
>     is intended to be applied on top of the merge that pulls in the agent
>     pool upgrade (which in turn is intended to be applied on top of maint).
>     
>     Changes since v1:
>     
>      * Rebased onto master, as it now has all the building blocks needed for
>        this.

A timely update that is very much appreciated.

Will apply.  Thanks.

>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-717%2Fdscho%2Fazure-pipelines-latest-pools-test_oid-v2
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-717/dscho/azure-pipelines-latest-pools-test_oid-v2
> Pull-Request: https://github.com/git/git/pull/717
>
> Range-diff vs v1:
>
>  1:  79ad5eaa75b ! 1:  a6e4e9cc6ad t5537: adjust test_oid label
>      @@ -30,4 +30,4 @@
>       +	printf "$(test_oid perl)" \
>        	       "$(git -C "$REPO" rev-parse HEAD)" \
>        	       "$(git -C "$REPO" rev-parse HEAD^)" \
>      - 	       >"$HTTPD_ROOT_PATH/one-time-perl" &&
>      + 	       >"$HTTPD_ROOT_PATH/one-time-sed" &&
>
>
>  t/t5537-fetch-shallow.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
> index 9e16512fe31..287d2c336be 100755
> --- a/t/t5537-fetch-shallow.sh
> +++ b/t/t5537-fetch-shallow.sh
> @@ -17,8 +17,8 @@ test_expect_success 'setup' '
>  	commit 4 &&
>  	git config --global transfer.fsckObjects true &&
>  	test_oid_cache <<-EOF
> -	sed sha1:s/0034shallow %s/0036unshallow %s/
> -	sed sha256:s/004cshallow %s/004eunshallow %s/
> +	perl sha1:s/0034shallow %s/0036unshallow %s/
> +	perl sha256:s/004cshallow %s/004eunshallow %s/
>  	EOF
>  '
>  
> @@ -243,7 +243,7 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f
>  	# with an empty packfile. This is done by refetching with a shorter
>  	# depth (to ensure that the packfile is empty), and overwriting the
>  	# shallow line in the response with the unshallow line we want.
> -	printf "$(test_oid sed)" \
> +	printf "$(test_oid perl)" \
>  	       "$(git -C "$REPO" rev-parse HEAD)" \
>  	       "$(git -C "$REPO" rev-parse HEAD^)" \
>  	       >"$HTTPD_ROOT_PATH/one-time-sed" &&
>
> base-commit: 2f268890c2cd2f115424936bbee27f8269080e5e

@gitgitgadget-git
Copy link

This patch series was integrated into pu via 0d65f3f.

@gitgitgadget-git
Copy link

This patch series was integrated into next via e46b2d9.

@gitgitgadget-git
Copy link

This patch series was integrated into master via 0d65f3f.

@gitgitgadget-git
Copy link

Closed via 0d65f3f.

@gitgitgadget-git gitgitgadget-git bot closed this Mar 5, 2020
@dscho dscho deleted the azure-pipelines-latest-pools-test_oid branch March 6, 2020 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant