From 07ac0cda58f98d1c207638a24e0a999d0b2e0e81 Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Mon, 24 Jun 2024 11:12:47 +0200 Subject: [PATCH] Address yaml warnings Signed-off-by: Mauro Morales --- .github/workflows/image-pr.yaml | 16 ++++++++-------- .github/workflows/image.yaml | 16 ++++++++-------- .yamllint | 4 ++-- Earthfile | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/image-pr.yaml b/.github/workflows/image-pr.yaml index 9fbdb7eac..773b1dedc 100644 --- a/.github/workflows/image-pr.yaml +++ b/.github/workflows/image-pr.yaml @@ -174,18 +174,18 @@ jobs: flavor: ubuntu flavor_release: "24.04" family: "ubuntu" - release_matcher: "23.10" # introduced so tests can be green while we wait for the kairos release with the latest flavor release + release_matcher: "23.10" # introduced so tests can be green while we wait for the kairos release with the latest flavor release needs: - core-ubuntu-24-lts # enable once the first alpine only release is out as it currently cannot find the latest alpine release properly - #upgrade-latest-alpine: - # uses: ./.github/workflows/reusable-upgrade-latest-test.yaml - # with: - # flavor: alpine - # flavor_release: "3.19" - # needs: - # - core-alpine + # upgrade-latest-alpine: + # uses: ./.github/workflows/reusable-upgrade-latest-test.yaml + # with: + # flavor: alpine + # flavor_release: "3.19" + # needs: + # - core-alpine custom-partitioning: uses: ./.github/workflows/reusable-custom-partitioning-test.yaml diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 7e7a6d9f5..41ee4e9d6 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -136,7 +136,7 @@ jobs: fail-fast: false matrix: include: - - flavor: opensuse # Kubo test needs systemd version 252+ which atm is not available in Leap + - flavor: opensuse # Kubo test needs systemd version 252+ which atm is not available in Leap flavorRelease: tumbleweed reset: uses: ./.github/workflows/reusable-qemu-reset-test.yaml @@ -216,7 +216,7 @@ jobs: flavor: ${{ matrix.flavor }} flavor_release: ${{ matrix.flavorRelease }} family: ${{ matrix.family }} - release_matcher: ${{ matrix.releaseMatcher }} # introduced so tests can be green while we wait for the kairos release with the latest flavor release + release_matcher: ${{ matrix.releaseMatcher }} # introduced so tests can be green while we wait for the kairos release with the latest flavor release needs: - core strategy: @@ -224,8 +224,8 @@ jobs: matrix: include: # cant do alpine yet as it hasnt been released with the proper name - #- flavor: alpine - # flavorRelease: "3.19" + # - flavor: alpine + # flavorRelease: "3.19" - flavor: opensuse flavorRelease: leap-15.6 family: opensuse @@ -331,7 +331,7 @@ jobs: flavor: ${{ matrix.flavor }} flavor_release: ${{ matrix.flavorRelease }} family: ${{ matrix.family }} - release_matcher: ${{ matrix.releaseMatcher }} # introduced so tests can be green while we wait for the kairos release with the latest flavor release + release_matcher: ${{ matrix.releaseMatcher }} # introduced so tests can be green while we wait for the kairos release with the latest flavor release needs: - standard strategy: @@ -339,13 +339,13 @@ jobs: max-parallel: 2 matrix: include: + # cant do alpine yet as it hasnt been released with the proper name + # - flavor: "alpine" + # flavorRelease: "3.19" - flavor: "opensuse" flavorRelease: "leap-15.6" family: "opensuse" releaseMatcher: "leap-15.5" - # cant do alpine yet as it hasnt been released with the proper name - #- flavor: "alpine" - # flavorRelease: "3.19" notify: runs-on: ubuntu-latest if: failure() diff --git a/.yamllint b/.yamllint index 242569fc0..cf932637f 100644 --- a/.yamllint +++ b/.yamllint @@ -3,7 +3,7 @@ extends: default rules: # 80 chars should be enough, but don't fail if a line is longer line-length: - max: 150 + max: 305 level: warning # accept both key: @@ -18,4 +18,4 @@ rules: check-keys: false document-start: - present: false \ No newline at end of file + present: false diff --git a/Earthfile b/Earthfile index 7d97e45d0..b821d9057 100644 --- a/Earthfile +++ b/Earthfile @@ -169,7 +169,7 @@ shellcheck-lint: FROM koalaman/shellcheck-alpine:$SHELLCHECK_VERSION WORKDIR /mnt COPY . . - RUN find . -name "*.sh" -print | xargs -r -n1 shellcheck + RUN find . -name "*.sh" ! -path "./examples/*" -print | xargs -r -n1 shellcheck yamllint: FROM cytopia/yamllint