From b7918a6b5415e5f0a37f7305f2a6c15538fb232b Mon Sep 17 00:00:00 2001 From: Jason Nagin <33561705+JasonN3@users.noreply.github.com> Date: Thu, 2 Jan 2025 12:17:07 -0500 Subject: [PATCH 1/5] test with base image --- .github/workflows/build_vars.yml | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml index ffbe6149..08edb559 100644 --- a/.github/workflows/build_vars.yml +++ b/.github/workflows/build_vars.yml @@ -19,10 +19,36 @@ on: "flatpak_refs" ], "image_repo": [ - "ghcr.io/ublue-os" + "ghcr.io/ublue-os", + "quay.io/fedora-ostree-desktops" ], - "image_name": [ - "base-main" + "include": [ + { + "image_repo": "ghcr.io/ublue-os", + "image_name": "base-main" + }, + { + "image_repo": "quay.io/fedora-ostree-desktops", + "image_name": "base" + } + ], + "exclude": [ + { + "image_repo": "quay.io/fedora-ostree-desktops", + "version": "39" + }, + { + "image_repo": "quay.io/fedora-ostree-desktops", + "version": "41" + }, + { + "image_repo": "quay.io/fedora-ostree-desktops", + "flatpaks": "flatpak_refs_dir" + }, + { + "image_repo": "quay.io/fedora-ostree-desktops", + "flatpaks": "flatpak_refs" + } ] }' VARIANT: From 972f741a4b78f54f3efad37a234cb49d5f5e36b7 Mon Sep 17 00:00:00 2001 From: Jason Nagin <33561705+JasonN3@users.noreply.github.com> Date: Thu, 2 Jan 2025 13:29:33 -0500 Subject: [PATCH 2/5] add 41 using base-atomic --- .github/workflows/build_vars.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml index 08edb559..35b659b7 100644 --- a/.github/workflows/build_vars.yml +++ b/.github/workflows/build_vars.yml @@ -30,17 +30,33 @@ on: { "image_repo": "quay.io/fedora-ostree-desktops", "image_name": "base" + }, + { + "image_repo": "quay.io/fedora-ostree-desktops", + "image_name": "base-atomic" } ], "exclude": [ { "image_repo": "quay.io/fedora-ostree-desktops", + "image_name": "base", "version": "39" }, { "image_repo": "quay.io/fedora-ostree-desktops", + "image_name": "base", "version": "41" }, + { + "image_repo": "quay.io/fedora-ostree-desktops", + "image_name": "base-atomic", + "version": "39" + }, + { + "image_repo": "quay.io/fedora-ostree-desktops", + "image_name": "base-atomic", + "version": "40" + }, { "image_repo": "quay.io/fedora-ostree-desktops", "flatpaks": "flatpak_refs_dir" From 353e443762d3ac6e2c8f18804bbc2351d2b5d7e9 Mon Sep 17 00:00:00 2001 From: Jason Nagin <33561705+JasonN3@users.noreply.github.com> Date: Thu, 2 Jan 2025 14:10:22 -0500 Subject: [PATCH 3/5] change where version is stored --- .github/workflows/build_vars.yml | 38 +++++++++++--------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml index 35b659b7..de484bf3 100644 --- a/.github/workflows/build_vars.yml +++ b/.github/workflows/build_vars.yml @@ -8,11 +8,6 @@ on: BUILD_MATRIX: value: ' { - "version": [ - "39", - "40", - "41" - ], "flatpaks": [ "false", "flatpak_refs_dir", @@ -25,38 +20,31 @@ on: "include": [ { "image_repo": "ghcr.io/ublue-os", - "image_name": "base-main" - }, - { - "image_repo": "quay.io/fedora-ostree-desktops", - "image_name": "base" + "image_name": "base-main", + "version": "39" }, { - "image_repo": "quay.io/fedora-ostree-desktops", - "image_name": "base-atomic" - } - ], - "exclude": [ - { - "image_repo": "quay.io/fedora-ostree-desktops", - "image_name": "base", - "version": "39" + "image_repo": "ghcr.io/ublue-os", + "image_name": "base-main", + "version": "40" }, { - "image_repo": "quay.io/fedora-ostree-desktops", - "image_name": "base", + "image_repo": "ghcr.io/ublue-os", + "image_name": "base-main", "version": "41" }, { "image_repo": "quay.io/fedora-ostree-desktops", - "image_name": "base-atomic", - "version": "39" + "image_name": "base" + "version": "40" }, { "image_repo": "quay.io/fedora-ostree-desktops", "image_name": "base-atomic", - "version": "40" - }, + "version": "41" + } + ], + "exclude": [ { "image_repo": "quay.io/fedora-ostree-desktops", "flatpaks": "flatpak_refs_dir" From 5824ad56a4e129b99d312fb82711699258011d81 Mon Sep 17 00:00:00 2001 From: Jason Nagin <33561705+JasonN3@users.noreply.github.com> Date: Thu, 2 Jan 2025 14:13:55 -0500 Subject: [PATCH 4/5] missing comma --- .github/workflows/build_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml index de484bf3..2118a80f 100644 --- a/.github/workflows/build_vars.yml +++ b/.github/workflows/build_vars.yml @@ -35,7 +35,7 @@ on: }, { "image_repo": "quay.io/fedora-ostree-desktops", - "image_name": "base" + "image_name": "base", "version": "40" }, { From 1165b967e126cd2a79e8e79969c63d123b7ca147 Mon Sep 17 00:00:00 2001 From: Jason Nagin <33561705+JasonN3@users.noreply.github.com> Date: Thu, 2 Jan 2025 14:20:08 -0500 Subject: [PATCH 5/5] rearrange matrix --- .github/workflows/build_vars.yml | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml index 2118a80f..336a4018 100644 --- a/.github/workflows/build_vars.yml +++ b/.github/workflows/build_vars.yml @@ -8,6 +8,11 @@ on: BUILD_MATRIX: value: ' { + "version": [ + "39", + "40", + "41" + ], "flatpaks": [ "false", "flatpak_refs_dir", @@ -21,30 +26,23 @@ on: { "image_repo": "ghcr.io/ublue-os", "image_name": "base-main", - "version": "39" - }, - { - "image_repo": "ghcr.io/ublue-os", - "image_name": "base-main", - "version": "40" - }, - { - "image_repo": "ghcr.io/ublue-os", - "image_name": "base-main", - "version": "41" }, { "image_repo": "quay.io/fedora-ostree-desktops", - "image_name": "base", - "version": "40" + "version": "40", + "image_name": "base" }, { "image_repo": "quay.io/fedora-ostree-desktops", - "image_name": "base-atomic", - "version": "41" + "version": "41", + "image_name": "base-atomic" } ], "exclude": [ + { + "image_repo": "quay.io/fedora-ostree-desktops", + "version": "39" + }, { "image_repo": "quay.io/fedora-ostree-desktops", "flatpaks": "flatpak_refs_dir"