From fafbcbeb56d5591bd8449c6c1e3472c7869186ce Mon Sep 17 00:00:00 2001 From: Itxaka Date: Wed, 31 May 2023 09:26:36 +0200 Subject: [PATCH] Build alpine pure in CI Signed-off-by: Itxaka --- .github/flavors.json | 5 +---- .github/workflows/image.yaml | 13 +++++-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/flavors.json b/.github/flavors.json index d71c473249..094f9af6c2 100644 --- a/.github/flavors.json +++ b/.github/flavors.json @@ -15,10 +15,7 @@ "flavor": "ubuntu-22-lts" }, { - "flavor": "alpine-ubuntu" - }, - { - "flavor": "alpine-opensuse-leap" + "flavor": "alpine" }, { "flavor": "fedora" diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 281da62ff4..cb90b1dc25 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -310,7 +310,7 @@ jobs: fail-fast: false matrix: include: - - flavor: "alpine-opensuse-leap" + - flavor: "alpine" - flavor: "opensuse-leap" - flavor: "opensuse-tumbleweed" - flavor: "ubuntu" @@ -381,7 +381,7 @@ jobs: fail-fast: false matrix: include: - - flavor: alpine-opensuse-leap + - flavor: alpine - flavor: opensuse-leap steps: - uses: actions/checkout@v3 @@ -422,7 +422,7 @@ jobs: fail-fast: false matrix: include: - - flavor: alpine-opensuse-leap + - flavor: alpine - flavor: opensuse-leap - flavor: ubuntu steps: @@ -444,7 +444,7 @@ jobs: fail-fast: false matrix: include: - - flavor: alpine-opensuse-leap + - flavor: alpine - flavor: opensuse-leap steps: - uses: actions/checkout@v3 @@ -513,11 +513,8 @@ jobs: fail-fast: false matrix: include: - - flavor: alpine-opensuse-leap + - flavor: alpine - flavor: opensuse-leap - # - flavor: "ubuntu" - # - flavor: "ubuntu" - # - flavor: "ubuntu" steps: - uses: actions/checkout@v3 - run: |