actions/build-container-installer
1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 10:57:55 +01:00
Code Releases Activity

cleanup

Browse source
This commit is contained in:
Jason Nagin 2024-10-29 12:25:41 -04:00 • committed by GitHub
parent 03fb874528
commit 697238fbdc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
.github/workflows/build_vars.yml vendored
View file

@ -18,16 +18,16 @@ on:
"flatpak_dir", "flatpak_dir",
"flatpak_refs" "flatpak_refs"
], ],
"exclude": [ #"exclude": [
{ # {
"version": "40", # "version": "40",
"flatpaks": "flatpak_dir" # "flatpaks": "flatpak_dir"
}, # },
{ # {
"version": "40", # "version": "40",
"flatpaks": "flatpak_refs" # "flatpaks": "flatpak_refs"
} # }
], #],
"include": [ "include": [
{ {
"version": "39", "version": "39",

1
lorax_templates/flatpak_set_repo.tmpl
View file

@ -2,7 +2,6 @@
% if int(version) >= 41: % if int(version) >= 41:
append etc/anaconda/conf.d/anaconda.conf "[Payload]" append etc/anaconda/conf.d/anaconda.conf "[Payload]"
append etc/anaconda/conf.d/anaconda.conf "flatpak_remote = ${flatpak_remote_name} ${_flatpak_repo_url}" append etc/anaconda/conf.d/anaconda.conf "flatpak_remote = ${flatpak_remote_name} ${_flatpak_repo_url}"
#replace "fedora oci+https://registry.fedoraproject.org" "${flatpak_remote_name} ${_flatpak_repo_url}" etc/anaconda/anaconda.conf
% else: % else:
replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py

5
test/iso/flatpak_repo_updated.sh
View file

@ -1,5 +1,10 @@
#!/bin/bash #!/bin/bash
if [[ ${VERSION} >= 41 ]]
then
exit 0
fi
add_line=$(grep flatpak_manager.add_remote mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py) add_line=$(grep flatpak_manager.add_remote mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py)
add_line_repo=$(echo "${add_line}" | grep "${FLATPAK_REMOTE_NAME}") add_line_repo=$(echo "${add_line}" | grep "${FLATPAK_REMOTE_NAME}")