Skip to content

Commit

Permalink
Remove dependency to branch
Browse files Browse the repository at this point in the history
  • Loading branch information
mauromorales committed Jul 6, 2023
1 parent a9441ce commit a535ae2
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/image-arm-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/image-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/image-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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 }}
Expand Down

0 comments on commit a535ae2

Please sign in to comment.