diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bb10286..a9a1544 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,8 +17,7 @@ jobs: matrix: include: - { target: qemux86-64, distro-release: "2024", distro-channel: next } - # Add once your target is published in the 2026 feed: - # - { target: qemux86-64, distro-release: "2026", distro-channel: next } + - { target: qemux86-64, distro-release: "2026", distro-channel: next } uses: avocado-linux/actions/.github/workflows/extension-release.yml@v1 with: target: ${{ matrix.target }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index abc3273..617674e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,10 +3,9 @@ name: Test # "Does it build" check on PRs. The matrix lives here (the caller owns it); each leg # calls the single-combo reusable helper. Add rows for more targets/feeds as needed. # -# Feed is 2024/next. Some targets are published in the 2026 feed too: flip a leg to -# { distro-release: "2026", distro-channel: next } once the packages your extension -# depends on exist there (check -# https://repo.avocadolinux.org/2026/next/target//repodata/repomd.xml). +# One leg per release the extension ships on: 2024/next and 2026/next. Drop a leg only +# if your target or the packages your extension depends on are not published there +# (check https://repo.avocadolinux.org//next/target//repodata/repomd.xml). # Note this only picks the feed + SDK image tag — the sdk.image string in # avocado.yaml stays release-scoped either way. on: @@ -20,6 +19,7 @@ jobs: matrix: include: - { target: qemux86-64, distro-release: "2024", distro-channel: next } + - { target: qemux86-64, distro-release: "2026", distro-channel: next } uses: avocado-linux/actions/.github/workflows/extension-test.yml@v1 with: target: ${{ matrix.target }} diff --git a/README.md b/README.md index d8f2809..8e93377 100644 --- a/README.md +++ b/README.md @@ -32,10 +32,11 @@ Release: tag the commit with the exact `avocado.yaml` version, e.g. `git tag 0.1 channel selects the *package feed*. - **CI comes from `avocado-linux/actions@v1`**, pinned. The matrix lives in the caller so each repo owns its own target/feed combinations. -- **The workflows here use the `2024`/`next` feed.** `avocado-linux/actions@v1` *defaults* - to `2026`/`edge`, but the workflows pass `2024`/`next` explicitly. Add or move a row to - `2026` once the packages your extension depends on are published there. Check - `https://repo.avocadolinux.org/2026/next/target//repodata/repomd.xml`. +- **CI covers both releases on the `next` channel.** Test and Release each run one leg + on `2024`/`next` and one on `2026`/`next` (`avocado-linux/actions@v1` would otherwise + default to `2026`/`edge`). Drop a leg only if your target or the packages your + extension depends on are not published on that release. Check + `https://repo.avocadolinux.org//next/target//repodata/repomd.xml`. ## Using this extension