From 5e24b8f0219e4e76cdd01c4f8175ff3b07c5d460 Mon Sep 17 00:00:00 2001 From: yxxhero Date: Thu, 8 Feb 2024 19:12:44 +0800 Subject: [PATCH 1/2] feat: support two helm minor version in test Signed-off-by: yxxhero --- .github/workflows/ci.yaml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 344f72ac..2084dded 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -50,13 +50,29 @@ jobs: - os: windows-latest shell: wsl experimental: false + helm-version: v3.13.3 - os: windows-latest shell: cygwin experimental: false + helm-version: v3.13.3 - os: ubuntu-latest container: alpine shell: sh experimental: false + helm-version: v3.13.3 + - os: windows-latest + shell: wsl + experimental: false + helm-version: v3.14.0 + - os: windows-latest + shell: cygwin + experimental: false + helm-version: v3.14.0 + - os: ubuntu-latest + container: alpine + shell: sh + experimental: false + helm-version: v3.14.0 steps: - name: Disable autocrlf @@ -70,7 +86,7 @@ jobs: - name: Setup Helm uses: azure/setup-helm@v3 with: - version: ${{ env.VERSION_HELM }} + version: ${{ matrix.helm-version }} - name: Setup WSL if: "contains(matrix.shell, 'wsl')" @@ -90,6 +106,14 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]')" needs: [build] runs-on: ubuntu-latest + strategy: + matrix: + include: + # Helm maintains the latest minor version only and therefore each Helmfile version supports 2 Helm minor versions. + # That's why we cover only 2 Helm minor versions in this matrix. + # See https://github.com/helmfile/helmfile/pull/286#issuecomment-1250161182 for more context. + - helm-version: v3.13.3 + - helm-version: v3.14.0 steps: - uses: engineerd/setup-kind@v0.5.0 with: @@ -100,7 +124,7 @@ jobs: - name: Setup Helm uses: azure/setup-helm@v3 with: - version: ${{ env.VERSION_HELM }} + version: ${{ matrix.helm-version }} - name: helm plugin install run: helm plugin install . From e3de870e2c3da6c4286c31c02f1d31297dc79a9b Mon Sep 17 00:00:00 2001 From: yxxhero Date: Thu, 8 Feb 2024 19:21:01 +0800 Subject: [PATCH 2/2] fix issues Signed-off-by: yxxhero --- .github/workflows/ci.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2084dded..f8fc649e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,9 +1,6 @@ --- name: CI -env: - VERSION_HELM: 'v3.11.3' - on: pull_request: push: @@ -46,6 +43,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] shell: [ default ] experimental: [ false ] + helm-version: [ v3.13.3, v3.14.0 ] include: - os: windows-latest shell: wsl