We have split the CI jobs in GitHub Workflows into two categories:
- Those running on a machine pool directly.
- Those running in a container on the machine pool.
The latter is more flexible because it allows us to freely pick whatever
container image we want to use for a specific job, while the former only
allows us to pick from a handful of different distros. The containerized
jobs shouldn't cause a significant slowdown, either, so they do not have
any significant upside to the best of my knowlegde. The only upside that
they did have before the preceding commit is that they run as a non-root
user, but that has been addressed now.
Convert all Linux jobs to be containerized for additional flexibility.
Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
---
.github/workflows/main.yml | 68 ++++++++++++++++++++++++++--------------------
1 file changed, 39 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b02f5873a540b458d38e7951b4ee3d5ca598ae23..8e5847da4fab009ad699c18e1a5a336a8b45c3ed 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -259,20 +259,6 @@ jobs:
fail-fast: false
matrix:
vector:
- - jobname: linux-sha256
- cc: clang
- pool: ubuntu-latest
- - jobname: linux-reftable
- cc: clang
- pool: ubuntu-latest
- - jobname: linux-gcc
- cc: gcc
- cc_package: gcc-8
- pool: ubuntu-20.04
- - jobname: linux-TEST-vars
- cc: gcc
- cc_package: gcc-8
- pool: ubuntu-20.04
- jobname: osx-clang
cc: clang
pool: macos-13
@@ -285,21 +271,6 @@ jobs:
- jobname: osx-meson
cc: clang
pool: macos-13
- - jobname: linux-gcc-default
- cc: gcc
- pool: ubuntu-latest
- - jobname: linux-leaks
- cc: gcc
- pool: ubuntu-latest
- - jobname: linux-reftable-leaks
- cc: gcc
- pool: ubuntu-latest
- - jobname: linux-asan-ubsan
- cc: clang
- pool: ubuntu-latest
- - jobname: linux-meson
- cc: gcc
- pool: ubuntu-latest
env:
CC: ${{matrix.vector.cc}}
CC_PACKAGE: ${{matrix.vector.cc_package}}
@@ -342,6 +313,44 @@ jobs:
fail-fast: false
matrix:
vector:
+ - jobname: linux-sha256
+ image: ubuntu:latest
+ cc: clang
+ distro: ubuntu-latest
+ - jobname: linux-reftable
+ image: ubuntu:latest
+ cc: clang
+ distro: ubuntu-latest
+ - jobname: linux-gcc
+ image: ubuntu:20.04
+ cc: gcc
+ cc_package: gcc-8
+ distro: ubuntu-20.04
+ - jobname: linux-TEST-vars
+ image: ubuntu:20.04
+ cc: gcc
+ cc_package: gcc-8
+ distro: ubuntu-20.04
+ - jobname: linux-gcc-default
+ image: ubuntu:latest
+ cc: gcc
+ distro: ubuntu-latest
+ - jobname: linux-leaks
+ image: ubuntu:latest
+ cc: gcc
+ distro: ubuntu-latest
+ - jobname: linux-reftable-leaks
+ image: ubuntu:latest
+ cc: gcc
+ distro: ubuntu-latest
+ - jobname: linux-asan-ubsan
+ image: ubuntu:latest
+ cc: clang
+ distro: ubuntu-latest
+ - jobname: linux-meson
+ image: ubuntu:latest
+ cc: gcc
+ distro: ubuntu-latest
- jobname: linux-musl
image: alpine
distro: alpine-latest
@@ -363,6 +372,7 @@ jobs:
env:
jobname: ${{matrix.vector.jobname}}
distro: ${{matrix.vector.distro}}
+ CC: ${{matrix.vector.cc}}
runs-on: ubuntu-latest
container: ${{matrix.vector.image}}
steps:
--
2.48.0.rc1.241.g6c04ab211c.dirty
