From: Ezekiel Newren <ezekielnewren@gmail.com>
Date: Tue, 28 Oct 2025 19:14:59 GMT
Subject: Re: [PATCH v2 1/5] gitlab-ci: reorder Linux job matrix to match GitHub's order
Message-ID: <CAH=ZcbAEBbDkAqp9cc908SgkM5BQOD_=52e6Y=EVd=cwyPU0Aw@mail.gmail.com>
In-Reply-To: <20251024-b4-pks-rust-cbindgen-v2-1-4b4bd4f18490@pks.im>

On Fri, Oct 24, 2025 at 3:51 AM Patrick Steinhardt <ps@pks.im> wrote:
>
> We have mostly the exact same CI configuration as GitHub has for our
> Linux jobs. It's harder than necessary though to compare them with one
> another as the ordering is different between both.
>
> Reorder the job matrix in GitLab CI to match GitHub's order.
>
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
>  .gitlab-ci.yml | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index b419a84e2c..1dbf236b2c 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -42,15 +42,15 @@ test:linux:
>        - jobname: linux-reftable
>          image: ubuntu:rolling
>          CC: clang
> +      - jobname: linux-TEST-vars
> +        image: ubuntu:20.04
> +        CC: gcc
> +        CC_PACKAGE: gcc-8
>        - jobname: linux-breaking-changes
>          image: ubuntu:20.04
>          CC: gcc
>        - jobname: fedora-breaking-changes-meson
>          image: fedora:latest
> -      - jobname: linux-TEST-vars
> -        image: ubuntu:20.04
> -        CC: gcc
> -        CC_PACKAGE: gcc-8
>        - jobname: linux-leaks
>          image: ubuntu:rolling
>          CC: gcc
> @@ -60,13 +60,13 @@ test:linux:
>        - jobname: linux-asan-ubsan
>          image: ubuntu:rolling
>          CC: clang
> +      - jobname: linux-meson
> +        image: ubuntu:rolling
> +        CC: gcc
>        - jobname: linux-musl-meson
>          image: alpine:latest
>        - jobname: linux32
>          image: i386/ubuntu:20.04
> -      - jobname: linux-meson
> -        image: ubuntu:rolling
> -        CC: gcc
>    artifacts:
>      paths:
>        - t/failed-test-artifacts
>
> --
> 2.51.1.930.gacf6e81ea2.dirty
>

Looks good.