From a535ae22412033998eab966a66fa271f685f5f09 Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Thu, 6 Jul 2023 10:10:05 +0200 Subject: [PATCH] Remove dependency to branch --- .github/workflows/image-arm-pr.yaml | 4 ++-- .github/workflows/image-arm.yaml | 4 ++-- .github/workflows/image-pr.yaml | 20 ++++++++++---------- .github/workflows/image.yaml | 22 +++++++++++----------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/image-arm-pr.yaml b/.github/workflows/image-arm-pr.yaml index 2cbfa345f4..f3c4c786ad 100644 --- a/.github/workflows/image-arm-pr.yaml +++ b/.github/workflows/image-arm-pr.yaml @@ -13,13 +13,13 @@ env: jobs: docker: - uses: kairos-io/kairos/.github/workflows/reusable-docker-arm-build.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-docker-arm-build.yaml with: flavor: opensuse-leap-arm-rpi model: rpi64 worker: ubuntu-latest image_and_iso_arm64_generic: - uses: kairos-io/kairos/.github/workflows/reusable-image-and-iso-arm-generic.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-image-and-iso-arm-generic.yaml with: flavor: opensuse-leap-arm-rpi diff --git a/.github/workflows/image-arm.yaml b/.github/workflows/image-arm.yaml index c1e270880c..d56de3ffbe 100644 --- a/.github/workflows/image-arm.yaml +++ b/.github/workflows/image-arm.yaml @@ -31,7 +31,7 @@ jobs: echo "::set-output name=matrix::{\"include\": $content }" docker: - uses: kairos-io/kairos/.github/workflows/reusable-docker-arm-build.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-docker-arm-build.yaml with: flavor: ${{ matrix.flavor }} model: ${{ matrix.model }} @@ -43,7 +43,7 @@ jobs: matrix: ${{fromJson(needs.get-matrix.outputs.matrix)}} image_and_iso_arm64_generic: - uses: kairos-io/kairos/.github/workflows/reusable-image-and-iso-arm-generic.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-image-and-iso-arm-generic.yaml with: flavor: ${{ matrix.flavor }} needs: diff --git a/.github/workflows/image-pr.yaml b/.github/workflows/image-pr.yaml index 972efdbe03..c82514bf12 100644 --- a/.github/workflows/image-pr.yaml +++ b/.github/workflows/image-pr.yaml @@ -11,68 +11,68 @@ env: FORCE_COLOR: 1 jobs: build: - uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml with: flavor: ubuntu install-test: - uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml with: flavor: ubuntu needs: - build zfs-test: - uses: kairos-io/kairos/.github/workflows/reusable-zfs-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-zfs-test.yaml with: flavor: ubuntu needs: - build qemu-acceptance-tests: - uses: kairos-io/kairos/.github/workflows/reusable-qemu-acceptance-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-qemu-acceptance-test.yaml with: flavor: ubuntu needs: - build qemu-bundles-tests: - uses: kairos-io/kairos/.github/workflows/reusable-qemu-bundles-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-qemu-bundles-test.yaml with: flavor: ubuntu needs: - build qemu-reset-tests: - uses: kairos-io/kairos/.github/workflows/reusable-qemu-reset-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-qemu-reset-test.yaml with: flavor: ubuntu needs: - build qemu-netboot-tests: - uses: kairos-io/kairos/.github/workflows/reusable-qemu-netboot-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-qemu-netboot-test.yaml with: flavor: ubuntu needs: - build upgrade-with-cli-test: - uses: kairos-io/kairos/.github/workflows/reusable-upgrade-with-cli-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-upgrade-with-cli-test.yaml with: flavor: ubuntu needs: - build upgrade-latest-with-cli-test: - uses: kairos-io/kairos/.github/workflows/reusable-upgrade-latest-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-upgrade-latest-test.yaml with: flavor: ubuntu needs: - build encryption-tests: - uses: kairos-io/kairos/.github/workflows/reusable-encryption-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-encryption-test.yaml with: flavor: ubuntu label: ${{ matrix.label }} diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 6be8d5812e..5debae2226 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -54,7 +54,7 @@ jobs: echo "::set-output name=matrix::{\"include\": $content }" build: - uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml with: flavor: ${{ matrix.flavor }} needs: @@ -66,7 +66,7 @@ jobs: build-framework: if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - uses: kairos-io/kairos/.github/workflows/reusable-build-framework-flavor.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-build-framework-flavor.yaml with: flavor: ${{ matrix.flavor }} needs: @@ -76,7 +76,7 @@ jobs: matrix: ${{fromJson(needs.get-framework-matrix.outputs.matrix)}} install-test: - uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml with: flavor: ${{ matrix.flavor }} needs: @@ -88,7 +88,7 @@ jobs: - flavor: opensuse-leap zfs-test: - uses: kairos-io/kairos/.github/workflows/reusable-zfs-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-zfs-test.yaml with: flavor: ${{ matrix.flavor }} needs: @@ -100,7 +100,7 @@ jobs: - flavor: "ubuntu" qemu-acceptance-tests: - uses: kairos-io/kairos/.github/workflows/reusable-qemu-acceptance-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-qemu-acceptance-test.yaml with: flavor: ${{ matrix.flavor }} needs: @@ -118,7 +118,7 @@ jobs: - flavor: "ubuntu-22-lts" qemu-bundles-tests: - uses: kairos-io/kairos/.github/workflows/reusable-qemu-bundles-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-qemu-bundles-test.yaml with: flavor: ${{ matrix.flavor }} needs: @@ -130,7 +130,7 @@ jobs: - flavor: opensuse-tumbleweed # Kubo test needs systemd version 252+ which atm is not available in Leap qemu-reset-tests: - uses: kairos-io/kairos/.github/workflows/reusable-qemu-reset-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-qemu-reset-test.yaml with: flavor: ${{ matrix.flavor }} needs: @@ -143,7 +143,7 @@ jobs: - flavor: opensuse-leap qemu-netboot-tests: - uses: kairos-io/kairos/.github/workflows/reusable-qemu-netboot-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-qemu-netboot-test.yaml with: flavor: ${{ matrix.flavor }} needs: @@ -157,7 +157,7 @@ jobs: - flavor: ubuntu upgrade-with-cli-test: - uses: kairos-io/kairos/.github/workflows/reusable-upgrade-with-cli-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-upgrade-with-cli-test.yaml with: flavor: ${{ matrix.flavor }} needs: @@ -170,7 +170,7 @@ jobs: - flavor: opensuse-leap upgrade-latest-with-cli-test: - uses: kairos-io/kairos/.github/workflows/reusable-upgrade-latest-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-upgrade-latest-test.yaml with: flavor: ${{ matrix.flavor }} needs: @@ -186,7 +186,7 @@ jobs: # - flavor: "ubuntu" encryption-tests: - uses: kairos-io/kairos/.github/workflows/reusable-encryption-test.yaml@1556-pr-one-flavor + uses: kairos-io/kairos/.github/workflows/reusable-encryption-test.yaml with: flavor: ${{ matrix.flavor }} label: ${{ matrix.label }}