From 8115bcdbef0a46b3e3bb4e00219c8fac4ea24a25 Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Wed, 4 Dec 2024 10:37:49 +0000 Subject: [PATCH] Stop being fancy Signed-off-by: Dan Webb --- .github/workflows/ci.yml | 78 ++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b0335ee..4e6062f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: statuses: write issues: write - integration-epel: + integration: &integration needs: lint-unit runs-on: ubuntu-latest strategy: @@ -25,64 +25,72 @@ jobs: os: - "almalinux-8" - "almalinux-9" + - "amazonlinux-2023" - "centos-stream-8" - "centos-stream-9" + - "debian-11" + - "debian-12" - "rockylinux-8" - "rockylinux-9" - suite: - - "epel" - steps: &steps - - name: Check out code - uses: actions/checkout@v4 - - name: Install Chef - uses: actionshub/chef-install@3.0.0 - - name: Dokken - uses: actionshub/test-kitchen@3.0.0 - env: - CHEF_LICENSE: accept-no-persist - KITCHEN_LOCAL_YAML: kitchen.dokken.yml - with: - suite: ${{ matrix.suite }} - os: ${{ matrix.os }} - - integration-nginx-full: - needs: lint-unit - runs-on: ubuntu-latest - strategy: - matrix: - os: - "ubuntu-2204" - "ubuntu-2404" suite: - - "distro-nginx-full" + - "distro" + - "repo" + - "repo-overrides" fail-fast: false steps: - <<: *steps + - name: Check out code + uses: actions/checkout@v4 + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + - name: Dokken + uses: actionshub/test-kitchen@3.0.0 + env: + CHEF_LICENSE: accept-no-persist + KITCHEN_LOCAL_YAML: kitchen.dokken.yml + with: + suite: ${{ matrix.suite }} + os: ${{ matrix.os }} - integration: - needs: lint-unit - runs-on: ubuntu-latest + integration-epel: + <<: *integration strategy: matrix: os: - "almalinux-8" - "almalinux-9" - - "amazonlinux-2023" - "centos-stream-8" - "centos-stream-9" - - "debian-11" - - "debian-12" - "rockylinux-8" - "rockylinux-9" + suite: + - "epel" + + integration-nginx-full: + needs: lint-unit + runs-on: ubuntu-latest + strategy: + matrix: + os: - "ubuntu-2204" - "ubuntu-2404" suite: - - "distro" - - "repo" - - "repo-overrides" + - "distro-nginx-full" fail-fast: false steps: - <<: *steps + - name: Check out code + uses: actions/checkout@v4 + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + - name: Dokken + uses: actionshub/test-kitchen@3.0.0 + env: + CHEF_LICENSE: accept-no-persist + KITCHEN_LOCAL_YAML: kitchen.dokken.yml + with: + suite: ${{ matrix.suite }} + os: ${{ matrix.os }} final: runs-on: ubuntu-latest