Update build_iso.yml
This commit is contained in:
parent
52aad87212
commit
ca95989567
1 changed files with 0 additions and 45 deletions
45
.github/workflows/build_iso.yml
vendored
45
.github/workflows/build_iso.yml
vendored
|
|
@ -56,49 +56,6 @@ jobs:
|
||||||
fi
|
fi
|
||||||
echo "extra-boot-params=${EXTRA_BOOT_PARAMS}" >> $GITHUB_OUTPUT
|
echo "extra-boot-params=${EXTRA_BOOT_PARAMS}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Set Flatpaks Directory Shortname
|
|
||||||
id: generate-flatpak-dir-shortname
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
FLATPAK_DIR_SHORTNAME="installer/kde_flatpaks"
|
|
||||||
|
|
||||||
if [[ "${{ matrix.image_name }}" =~ "gnome" ]]; then
|
|
||||||
FLATPAK_DIR_SHORTNAME="installer/gnome_flatpaks"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "flatpak-dir-shortname=${FLATPAK_DIR_SHORTNAME}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Determine Flatpak Dependencies
|
|
||||||
id: flatpak_dependencies
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
set -ex
|
|
||||||
image="ghcr.io/badbl0cks/${{ matrix.image_name }}:${{ steps.generate-tag.outputs.tag }}"
|
|
||||||
# Make temp space
|
|
||||||
TEMP_FLATPAK_INSTALL_DIR=$(mktemp -d -p ${{ github.workspace }} flatpak.XXX)
|
|
||||||
# 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' ' ' )
|
|
||||||
# Generate install script
|
|
||||||
cat << EOF > ${TEMP_FLATPAK_INSTALL_DIR}/script.sh
|
|
||||||
cat /temp_flatpak_install_dir/script.sh
|
|
||||||
mkdir -p /flatpak/flatpak /flatpak/triggers
|
|
||||||
mkdir /var/tmp || true
|
|
||||||
chmod -R 1777 /var/tmp
|
|
||||||
flatpak config --system --set languages "*"
|
|
||||||
flatpak remote-add --system flathub https://flathub.org/repo/flathub.flatpakrepo
|
|
||||||
flatpak install --system -y ${FLATPAK_REFS_DIR_LIST}
|
|
||||||
ostree refs --repo=\${FLATPAK_SYSTEM_DIR}/repo | grep '^deploy/' | grep -v 'org\.freedesktop\.Platform\.openh264' | sed 's/^deploy\///g' > /output/flatpaks_with_deps
|
|
||||||
EOF
|
|
||||||
docker run --rm --privileged \
|
|
||||||
--entrypoint bash \
|
|
||||||
-e FLATPAK_SYSTEM_DIR=/flatpak/flatpak \
|
|
||||||
-e FLATPAK_TRIGGERSDIR=/flatpak/triggers \
|
|
||||||
--volume ${FLATPAK_REFS_DIR}:/output \
|
|
||||||
--volume ${TEMP_FLATPAK_INSTALL_DIR}:/temp_flatpak_install_dir \
|
|
||||||
${image} /temp_flatpak_install_dir/script.sh
|
|
||||||
docker rmi ${image}
|
|
||||||
|
|
||||||
- name: Build ISOs
|
- name: Build ISOs
|
||||||
uses: jasonn3/build-container-installer@v1.2.0
|
uses: jasonn3/build-container-installer@v1.2.0
|
||||||
id: build
|
id: build
|
||||||
|
|
@ -114,8 +71,6 @@ jobs:
|
||||||
iso_name: ${{ matrix.image_name }}-${{ steps.generate-tag.outputs.tag }}.iso
|
iso_name: ${{ matrix.image_name }}-${{ steps.generate-tag.outputs.tag }}.iso
|
||||||
enable_cache_dnf: "false"
|
enable_cache_dnf: "false"
|
||||||
enable_cache_skopeo: "false"
|
enable_cache_skopeo: "false"
|
||||||
flatpak_remote_refs_dir: ${{ steps.generate-flatpak-dir-shortname.outputs.flatpak-dir-shortname }}
|
|
||||||
enable_flatpak_dependencies: "false"
|
|
||||||
extra_boot_params: ${{ steps.generate-extra-params.outputs.extra-boot-params }}
|
extra_boot_params: ${{ steps.generate-extra-params.outputs.extra-boot-params }}
|
||||||
|
|
||||||
- name: Move ISOs to Upload Directory
|
- name: Move ISOs to Upload Directory
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue