Willy,

whoops. I apparently didn't properly clean up my `outgoing/` folder and thus
accidentally duplicated some of the patches.

To reduce the confusion of which patches are intended to be correct, I'm
sending a clean "v2" series. The patches without the "v2" in the Subject should
be ignored.

For reference, here's the previous cover letter (which was accurate):

> please find some patches to clean up the CI configuration a little to reduce
> the amount of "copy and paste" duplication across the workflows a little. I 
> did
> not test all of the changes, but tested the ones where I'm not sufficiently
> sure they are correct.
> 
> My initial goal with the vtest.yml and matrix.py was to ensure consistent 
> setup
> for every job, such that changes only need to be made in a single location. 
> The
> last patch ("Consistently set up VTest with `./.github/actions/setup-vtest`")
> is a symptom of this duplication.
> 
> I would have merged the jobs more, but for some of them I'm not sure if the
> differences are intentional or not. The openssl-ech.yml and openssl-master.yml
> would be an example, where only one of them includes `ERR=1` when building
> HAProxy. It's also not quite clear to me what the difference between
> openssl-master.yml and the `OPENSSL_VERSION=latest` variant in matrix.py is.
> Ideally this all could be merged into the vtest.yml one way or another.

I apologize for the noise.

Best regards

Tim Duesterhus (9):
  CI: Drop obsolete `packages: write` permission from
    `quic-interop-*.yml`
  CI: Consistently add a top-level `permissions` definition to GHA
    workflows
  CI: Wrap all `if:` conditions in `${{ }}`
  CI: Fix regular expression escaping in matrix.py
  CI: Update to actions/checkout@v6
  CI: Simplify version extraction with `haproxy -vq`
  CI: Merge `aws-lc.yml` and `aws-lc-fips.yml` into `aws-lc.yml`
  CI: Merge `aws-lc-template.yml` into `aws-lc.yml`
  CI: Consistently set up VTest with `./.github/actions/setup-vtest`

 .github/actions/setup-vtest/action.yml      |  2 +-
 .github/matrix.py                           |  6 +-
 .github/workflows/aws-lc-fips.yml           | 12 ---
 .github/workflows/aws-lc-template.yml       | 94 --------------------
 .github/workflows/aws-lc.yml                | 95 ++++++++++++++++++++-
 .github/workflows/codespell.yml             |  2 +-
 .github/workflows/compliance.yml            |  4 +-
 .github/workflows/contrib.yml               |  2 +-
 .github/workflows/coverity.yml              |  2 +-
 .github/workflows/cross-zoo.yml             |  2 +-
 .github/workflows/fedora-rawhide.yml        |  4 +-
 .github/workflows/illumos.yml               |  7 +-
 .github/workflows/musl.yml                  |  5 +-
 .github/workflows/netbsd.yml                |  7 +-
 .github/workflows/openssl-ech.yml           |  8 +-
 .github/workflows/openssl-master.yml        |  4 +-
 .github/workflows/quic-interop-aws-lc.yml   | 11 ++-
 .github/workflows/quic-interop-libressl.yml | 11 ++-
 .github/workflows/quictls.yml               |  4 +-
 .github/workflows/vtest.yml                 |  6 +-
 .github/workflows/windows.yml               |  2 +-
 .github/workflows/wolfssl.yml               |  4 +-
 22 files changed, 136 insertions(+), 158 deletions(-)
 delete mode 100644 .github/workflows/aws-lc-fips.yml
 delete mode 100644 .github/workflows/aws-lc-template.yml

-- 
2.53.0



Reply via email to