From 108c0f49fbedc68f572979a03fafda6c777669db Mon Sep 17 00:00:00 2001 From: Noel Miller Date: Wed, 2 Oct 2024 12:39:03 -0500 Subject: [PATCH 1/3] feat: add specific flatpaks to dx images Podman Desktop is an example app that we would want to add specifically only to DX images. --- .github/workflows/reusable-build-iso.yml | 4 ++++ dx_flatpaks/flatpaks | 1 + 2 files changed, 5 insertions(+) create mode 100644 dx_flatpaks/flatpaks diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml index f710ec43484..a8502a29fca 100644 --- a/.github/workflows/reusable-build-iso.yml +++ b/.github/workflows/reusable-build-iso.yml @@ -126,6 +126,10 @@ jobs: # Get list of refs from directory FLATPAK_REFS_DIR=${{ github.workspace }}/${{ steps.generate-flatpak-dir-shortname.outputs.flatpak-dir-shortname }} FLATPAK_REFS_DIR_LIST=$(cat ${FLATPAK_REFS_DIR}/* | tr '\n' ' ' ) + DX_FLATPAK_REFS_DIR_LIST="$(cat dx_flatpaks/* | tr '\n' ' ' )" + if [[ env.IMAGE_NAME == *-dx ]]; then + FLATPAK_REFS_DIR_LIST="${FLATPAK_REFS_DIR_LIST} ${DX_FLATPAK_REFS_DIR_LIST}" + fi # Generate install script cat << EOF > ${TEMP_FLATPAK_INSTALL_DIR}/script.sh cat /temp_flatpak_install_dir/script.sh diff --git a/dx_flatpaks/flatpaks b/dx_flatpaks/flatpaks new file mode 100644 index 00000000000..e717534bdda --- /dev/null +++ b/dx_flatpaks/flatpaks @@ -0,0 +1 @@ +app/io.podman_desktop.PodmanDesktop/x86_64/stable From 382d56ca1218123b7a106d66e0169ea496b81a8b Mon Sep 17 00:00:00 2001 From: Noel Miller Date: Wed, 2 Oct 2024 12:54:17 -0500 Subject: [PATCH 2/3] fix: Fixed syntax for nvidia images --- .github/workflows/reusable-build-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml index a8502a29fca..ded3d382b00 100644 --- a/.github/workflows/reusable-build-iso.yml +++ b/.github/workflows/reusable-build-iso.yml @@ -127,7 +127,7 @@ jobs: FLATPAK_REFS_DIR=${{ github.workspace }}/${{ steps.generate-flatpak-dir-shortname.outputs.flatpak-dir-shortname }} FLATPAK_REFS_DIR_LIST=$(cat ${FLATPAK_REFS_DIR}/* | tr '\n' ' ' ) DX_FLATPAK_REFS_DIR_LIST="$(cat dx_flatpaks/* | tr '\n' ' ' )" - if [[ env.IMAGE_NAME == *-dx ]]; then + if [[ env.IMAGE_NAME == *"-dx"* ]]; then FLATPAK_REFS_DIR_LIST="${FLATPAK_REFS_DIR_LIST} ${DX_FLATPAK_REFS_DIR_LIST}" fi # Generate install script From adbfd4520b8c0f724431ab14e5463d7fae6ec09a Mon Sep 17 00:00:00 2001 From: Noel Miller Date: Wed, 2 Oct 2024 13:29:48 -0500 Subject: [PATCH 3/3] fix: typo --- .github/workflows/reusable-build-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml index ded3d382b00..f66d7b21b98 100644 --- a/.github/workflows/reusable-build-iso.yml +++ b/.github/workflows/reusable-build-iso.yml @@ -127,7 +127,7 @@ jobs: FLATPAK_REFS_DIR=${{ github.workspace }}/${{ steps.generate-flatpak-dir-shortname.outputs.flatpak-dir-shortname }} FLATPAK_REFS_DIR_LIST=$(cat ${FLATPAK_REFS_DIR}/* | tr '\n' ' ' ) DX_FLATPAK_REFS_DIR_LIST="$(cat dx_flatpaks/* | tr '\n' ' ' )" - if [[ env.IMAGE_NAME == *"-dx"* ]]; then + if [[ ${{ env.IMAGE_NAME }} == *"-dx"* ]]; then FLATPAK_REFS_DIR_LIST="${FLATPAK_REFS_DIR_LIST} ${DX_FLATPAK_REFS_DIR_LIST}" fi # Generate install script