Reusable workflows and README version table

.github/workflows/container-tests.yml

@@ -4,72 +4,14 @@ on:
       - created
 jobs:
   distgen-check:
-    name: "Check distgen generated files"
-    runs-on: ubuntu-latest
-    if: |
-      github.event.issue.pull_request
-      && (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]'))
-      && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v5
-        with:
-          ref: "refs/pull/${{ github.event.issue.number }}/head"
-          submodules: true
-
-      - name: Check distgen generated files
-        id: check
-        shell: bash
-        run: |
-          sha=$(git rev-parse HEAD)
-          sudo apt update && sudo apt -y install python3-pip
-          pip3 install distgen
-          result="success"
-          ./common/tests/check_distgen_generated_files.sh || result="failure"
-          echo "result=$result" >> "$GITHUB_OUTPUT"
-          echo "sha=$sha" >> "$GITHUB_OUTPUT"
-
-      - name: Set final commit status
-        uses: myrotvorets/set-commit-status-action@v2.0.0
-        with:
-          status: ${{ steps.check.outputs.result }}
-          context: "Distgen check"
-          sha: ${{ steps.check.outputs.sha }}
-
-      - name: Exit on ERR
-        shell: bash
-        run: |
-          _result=${{ steps.check.outputs.result }}
-          if [ "$_result" == failure ]; then
-            echo "::error::Distgen-generated files are not regenerated properly."
-            echo "::warning::Please regenerate them with:"
-            echo "::warning::'make clean-versions'"
-            echo "::warning::'make generate-all'"
-            exit 1
-          fi
+    uses: "sclorg/ci-actions/.github/workflows/distgen-check.yml@main"
+  check-readme:
+    uses: "sclorg/ci-actions/.github/workflows/check-readme.yml@main"
   container-tests:
-    name: "Container tests: ${{ matrix.version }} - ${{ matrix.os_test }}"
-    needs: distgen-check
-    runs-on: ubuntu-latest
-    concurrency:
-      group: container-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
-      cancel-in-progress: true
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [ "6", "7" ]
-        os_test: [ "fedora", "rhel8", "rhel9", "rhel10", "c9s", "c10s" ]
-        test_case: [ "container" ]
-
-    if: |
-      github.event.issue.pull_request
-      && (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]'))
-      && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
-    steps:
-      - uses: sclorg/tfaga-wrapper@main
-        with:
-          os_test: ${{ matrix.os_test }}
-          version: ${{ matrix.version }}
-          test_case: ${{ matrix.test_case }}
-          public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }}
-          private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }}
+    needs: check-readme
+    uses: "sclorg/ci-actions/.github/workflows/container-tests.yml@main"
+    with:
+      enabled-tests: '["container","container-pytest"]'
+      versions: '[ "6", "7" ]'
+      openshift-versions: '[ "6", "7" ]'
+    secrets: inherit

README.md

@@ -3,35 +3,23 @@ Varnish HTTP accelerator container images
 
 [![Build and push images to Quay.io registry](https://github.com/sclorg/varnish-container/actions/workflows/build-and-push.yml/badge.svg)](https://github.com/sclorg/varnish-container/actions/workflows/build-and-push.yml)
 
-Images available on Quay are:
-* CentOS Stream 9 [varnish-6](https://quay.io/repository/sclorg/varnish-6-c9s)
-* CentOS Stream 10 [varnish-6](https://quay.io/repository/sclorg/varnish-7-c10s)
-* Fedora [varnish-7](https://quay.io/repository/fedora/varnish-7)
-
 This repository contains Dockerfiles for Varnish HTTP accelerator images.
 Users can choose between RHEL, CentOS, CentOS Stream 8, CentOS Stream 9 and Fedora based images.
 
 
 Versions
 ---------------
-Varnish versions currently provided are:
-* [varnish-6](./6)
-* [varnish-7](./7)
-
-RHEL versions currently supported are:
-* RHEL8
-* RHEL9
-* RHEL10
-
-CentOS versions currently supported are:
-* CentOS Stream 9
-* CentOS Stream 10
-
-For more information about contributing, see
-[the Contribution Guidelines](https://github.com/sclorg/welcome/blob/master/contribution.md).
-For more information about concepts used in these container images, see the
-[Landing page](https://github.com/sclorg/welcome).
-
+Currently supported versions are visible in the following table, expand an entry to see its container registry address.
+<!--
+Table start
+-->
+||CentOS Stream 9|CentOS Stream 10|Fedora|RHEL 8|RHEL 9|RHEL 10|
+|:--|:--:|:--:|:--:|:--:|:--:|:--:|
+|6|<details><summary>✓</summary>`quay.io/sclorg/varnish-6-c9s`</details>|||<details><summary>✓</summary>`registry.redhat.io/rhel8/varnish-6`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/varnish-6`</details>||
+|7||<details><summary>✓</summary>`quay.io/sclorg/varnish-7-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/varnish-7`</details>|||<details><summary>✓</summary>`registry.redhat.io/rhel10/varnish-7`</details>|
+<!--
+Table end
+-->
 
 Installation
 ---------------