From d37171aa1d33dbf3b27dc34e7cd1b831a8444ef4 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Fri, 27 Oct 2023 14:40:31 +0300 Subject: [PATCH] Merge 2 jobs in one and fix references to renamed opensuse-leap family Signed-off-by: Dimitris Karakasilis --- .github/workflows/bump_repos.yml | 18 +++++++- .github/workflows/image-arm-pr.yaml | 2 +- .github/workflows/image.yaml | 10 ++--- .github/workflows/release-arm.yaml | 65 ++++++++++------------------- .github/workflows/uki.yaml | 2 +- 5 files changed, 44 insertions(+), 53 deletions(-) diff --git a/.github/workflows/bump_repos.yml b/.github/workflows/bump_repos.yml index 8c0601f62..59c2b86cb 100644 --- a/.github/workflows/bump_repos.yml +++ b/.github/workflows/bump_repos.yml @@ -15,13 +15,27 @@ jobs: packages: utils/earthly - name: Old packages run: | - earthly +base-image --VARIANT=standard --FLAVOR=opensuse-leap --K3S_VERSION=latest + earthly +base-image \ + --FAMILY=opensuse \ + --FLAVOR=opensuse \ + --FLAVOR_RELEASE=leap-15.5 \ + --VARIANT=standard \ + --MODEL=generic \ + --BASE_IMAGE=opensuse/leap:15.5 \ + --K3S_VERSION=latest mv build/versions.yaml build/versions.old.yaml - name: Bump cos 🔧 run: earthly +bump-repositories - name: New packages run: | - earthly +base-image --VARIANT=standard --FLAVOR=opensuse-leap --K3S_VERSION=latest + earthly +base-image + --FAMILY=opensuse \ + --FLAVOR=opensuse \ + --FLAVOR_RELEASE=leap-15.5 \ + --VARIANT=standard \ + --MODEL=generic \ + --BASE_IMAGE=opensuse/leap:15.5 \ + --K3S_VERSION=latest mv build/versions.yaml build/versions.new.yaml - name: Diff versions and generate pr message run: .github/repo-diff-msg.sh diff --git a/.github/workflows/image-arm-pr.yaml b/.github/workflows/image-arm-pr.yaml index f35a8227c..1c0ec4800 100644 --- a/.github/workflows/image-arm-pr.yaml +++ b/.github/workflows/image-arm-pr.yaml @@ -17,7 +17,7 @@ jobs: with: flavor: opensuse flavor_release: leap-15.5 - family: opensuse-leap + family: opensuse base_image: opensuse/leap:15.5 model: rpi4 worker: fast diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 19017ef7a..a20a86247 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -142,7 +142,7 @@ jobs: variant: core - flavor: opensuse flavorRelease: leap-15.5 - family: opensuse-leap + family: opensuse base_image: opensuse/leap:15.5 model: generic variant: core @@ -169,7 +169,7 @@ jobs: baseImage: alpine:3.18 - flavor: opensuse flavorRelease: leap-15.5 - family: opensuse-leap + family: opensuse variant: core model: generic baseImage: opensuse/leap:15.5 @@ -211,7 +211,7 @@ jobs: # flavorRelease: "3.18" - flavor: opensuse flavorRelease: leap-15.5 - family: opensuse-leap + family: opensuse encryption: uses: ./.github/workflows/reusable-encryption-test.yaml with: @@ -249,7 +249,7 @@ jobs: include: - flavor: opensuse flavorRelease: leap-15.5 - family: opensuse-leap + family: opensuse baseImage: opensuse/leap:15.5 - flavor: alpine flavorRelease: "3.18" @@ -301,7 +301,7 @@ jobs: include: - flavor: "opensuse" flavorRelease: "leap-15.5" - family: "opensuse-leap" + family: "opensuse" # cant do alpine yet as it hasnt been released with the proper name #- flavor: "alpine" # flavorRelease: "3.18" diff --git a/.github/workflows/release-arm.yaml b/.github/workflows/release-arm.yaml index 3d668476f..30d8acf0c 100644 --- a/.github/workflows/release-arm.yaml +++ b/.github/workflows/release-arm.yaml @@ -281,13 +281,24 @@ jobs: sarif_file: 'sarif' category: ${{ matrix.flavor }} - build-arm-generic-core: + build-arm-generic: runs-on: ubuntu-latest strategy: fail-fast: false matrix: - flavor: - - "opensuse-leap" + include: + - flavor: opensuse + flavor_release: leap-15.5 + family: opensuse + base_image: opensuse/leap:15.5 + model: generic + variant: core + - flavor: opensuse + flavor_release: leap-15.5 + family: opensuse + base_image: opensuse/leap:15.5 + model: generic + variant: standard steps: - uses: actions/checkout@v4 with: @@ -308,47 +319,13 @@ jobs: run: echo ${{ secrets.QUAY_PASSWORD }} | docker login -u ${{ secrets.QUAY_USERNAME }} --password-stdin quay.io - name: Build iso 🔧 run: | - earthly -P +all-arm-generic --VARIANT=core --FLAVOR=${{ matrix.flavor }} - sudo mv build release - - name: Push to quay - if: startsWith(github.ref, 'refs/tags/') - run: | - docker push $(cat release/IMAGE) - - name: Release - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - files: | - release/*iso* - - build-arm-generic-standard: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - flavor: - - "opensuse-leap" - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install earthly - uses: Luet-lab/luet-install-action@v1.1 - with: - repository: quay.io/kairos/packages - packages: utils/earthly - - name: Set up QEMU - uses: docker/setup-qemu-action@master - with: - platforms: all - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3 - - name: Login to Quay Registry - run: echo ${{ secrets.QUAY_PASSWORD }} | docker login -u ${{ secrets.QUAY_USERNAME }} --password-stdin quay.io - - name: Build iso 🔧 - run: | - earthly -P +all-arm-generic --VARIANT=standard --FLAVOR=${{ matrix.flavor }} --K3S_VERSION=latest + earthly -P +all-arm-generic \ + --FLAVOR=${{ matrix.flavor }} \ + --FLAVOR_RELEASE=${{ matrix.flavor_release }} \ + --FAMILY=${{ matrix.family }} \ + --BASE_IMAGE=${{ matrix.base_image}} \ + --MODEL=${{ matrix.model }} \ + --VARIANT=${{ matrix.variant }} sudo mv build release - name: Push to quay if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/uki.yaml b/.github/workflows/uki.yaml index 59958f0a1..a442c68d3 100644 --- a/.github/workflows/uki.yaml +++ b/.github/workflows/uki.yaml @@ -43,7 +43,7 @@ jobs: earthly +iso-uki \ --FLAVOR=opensuse \ --FLAVOR_RELEASE=leap-15.5 \ - --FAMILY=opensuse-leap \ + --FAMILY=opensuse \ --MODEL=generic \ --VARIANT=core \ --BASE_IMAGE=opensuse/leap:15.5 \