Skip to content

Commit f0ed2ce

Browse files
committed
Simplified CI matrix to allow excluding to function
1 parent 9307ba4 commit f0ed2ce

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

.github/workflows/push.yaml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,11 @@ jobs:
1414
install:
1515
strategy:
1616
matrix:
17-
KUBECTL_VERSION: ["v1.27.0", "v1.28.0", "v1.29.0", "v1.30.0"]
18-
isMain:
19-
- ${{ contains(github.ref, 'main') }}
20-
include:
21-
- KUBECTL_VERSION: "v1.27.0"
22-
K3S_VERSION: "v1.27.14+k3s1"
23-
- KUBECTL_VERSION: "v1.28.0"
24-
K3S_VERSION: "v1.28.10+k3s1"
25-
- KUBECTL_VERSION: "v1.29.0"
26-
K3S_VERSION: "v1.29.5+k3s1"
27-
- KUBECTL_VERSION: "v1.30.0"
28-
K3S_VERSION: "v1.30.1+k3s1"
17+
K3S_VERSION: ["v1.27.14+k3s1", "v1.28.10+k3s1", "v1.29.5+k3s1", "v1.30.1+k3s1"]
2918
exclude:
30-
- KUBECTL_VERSION: "v1.27.0"
31-
isMain: false
32-
- KUBECTL_VERSION: ${{ github.base_ref != 'refs/heads/main' && 'v1.28.0' }}
33-
- KUBECTL_VERSION: ${{ github.base_ref != 'refs/heads/main' && 'v1.29.0' }}
19+
- K3S_VERSION: ${{ github.base_ref != 'refs/heads/main' && 'v1.27.14+k3s1' }}
20+
- K3S_VERSION: ${{ github.base_ref != 'refs/heads/main' && 'v1.28.10+k3s1' }}
21+
- K3S_VERSION: ${{ github.base_ref != 'refs/heads/main' && 'v1.29.5+k3s1' }}
3422
runs-on: self-hosted
3523
steps:
3624
- name: Cleanup
@@ -45,7 +33,6 @@ jobs:
4533

4634
- name: Install dependencies
4735
env:
48-
KUBECTL_VERSION: ${{ matrix.KUBECTL_VERSION }}
4936
HELM_VERSION: "v3.11.3"
5037
HELM_DIFF_VERSION: "3.6.0"
5138
HELMFILE_VERSION: "v0.152.0"
@@ -68,7 +55,6 @@ jobs:
6855
- name: Reinstall K3S
6956
env:
7057
INSTALL_K3S_VERSION: ${{ matrix.K3S_VERSION }}
71-
INSTALL_K3S_SYMLINK: "skip"
7258
K3S_KUBECONFIG_MODE: "644"
7359
run: |
7460
/usr/local/bin/k3s-uninstall.sh

0 commit comments

Comments
 (0)