8000 ci: update FreeBSD image to 14.3 by carenas · Pull Request #2006 · git/git · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

ci: update FreeBSD image to 14.3 #2006

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

carenas
Copy link
Contributor
@carenas carenas commented Jul 1, 2025

No description provided.

FreeBSD 13.4 is no longer supported, and 13.5 will be the last
release from that series, so jump instead to 14.3 which should
be supported for another 10 months and will be at that point
the oldest supported release with the interim release of 15.

While at it, move some variables to the environment and make
sure to skip a git grep test that assumes glibc regex.

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
@carenas
Copy link
Contributor Author
carenas commented Jul 1, 2025

/submit

Copy link

Submitted as pull.2006.git.git.1751345578742.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-git-2006/carenas/master-v1

To fetch this version to local tag pr-git-2006/carenas/master-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-git-2006/carenas/master-v1

Copy link

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

"Carlo Marcelo Arenas Belón via GitGitGadget"
<gitgitgadget@gmail.com> writes:

> From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas@gmail.com>
>
> FreeBSD 13.4 is no longer supported, and 13.5 will be the last
> release from that series, so jump instead to 14.3 which should
> be supported for another 10 months and will be at that point
> the oldest supported release with the interim release of 15.
>
> While at it, move some variables to the environment and make
> sure to skip a git grep test that assumes glibc regex.
>
> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
> ---
>     ci: update FreeBSD image to 14.3
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2006%2Fcarenas%2Fmaster-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2006/carenas/master-v1
> Pull-Request: https://github.com/git/git/pull/2006

Thanks, will queue.



>
>  .cirrus.yml | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index 1fbdc2652b3..fef04a38402 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -5,11 +5,13 @@ freebsd_task:
>    env:
>      GIT_PROVE_OPTS: "--timer --jobs 10"
>      GIT_TEST_OPTS: "--no-chain-lint --no-bin-wrappers"
> -    MAKEFLAGS: "-j4"
> +    GIT_SKIP_TESTS: t7815.12
> +    MAKEFLAGS: -j4
>      DEFAULT_TEST_TARGET: prove
> +    DEFAULT_UNIT_TEST_TARGET: unit-tests-prove
>      DEVELOPER: 1
>    freebsd_instance:
> -    image_family: freebsd-13-4
> +    image_family: freebsd-14-3
>      memory: 2G
>    install_script:
>      pkg install -y gettext gmake perl5
> @@ -19,4 +21,4 @@ freebsd_task:
>    build_script:
>      - su git -c gmake
>    test_script:
> -    - su git -c 'gmake DEFAULT_UNIT_TEST_TARGET=unit-tests-prove test unit-tests'
> +    - su git -c 'gmake test unit-tests'
>
> base-commit: 83014dc05f6fc9275c0a02886cb428805abaf9e5

Copy link

This patch series was integrated into seen via 214a99c.

@gitgitgadget-git gitgitgadget-git bot added the seen label Jul 1, 2025
Copy link

This patch series was integrated into seen via 5f2b2ab.

Copy link

This patch series was integrated into next via def60da.

@gitgitgadget-git gitgitgadget-git bot added the next label Jul 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant
0