diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 270e354..0a4733b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -88,8 +88,11 @@ jobs: - name: Install libguestfs run: sudo apt-get install -y libguestfs-tools - # - name: Rebuild image - # run: ./customize.sh ${{ env.SOURCE_IMGFILE }} ${{ matrix.variant }} + - name: Rebuild image + run: | + sudo virt-customize -a "${{ env.SOURCE_IMGFILE }}" \ + --install "${{ env.IMAGE_PACKAGES }}" \ + --run-command "apt-get clean" - name: Compress image artifact run: sudo virt-sparsify ${{ env.SOURCE_IMGFILE }} --compress ${{ env.TARGET_IMGFILE }} @@ -97,4 +100,5 @@ jobs: - name: Upload custom image to a GitHub Release run: gh release upload "${{ env.GITHUB_RELEASE }}" ${{ env.TARGET_IMGFILE }} --clobber - - run: echo "### Finished! :rocket:" >> $GITHUB_STEP_SUMMARY + - name: Summary + run: echo "### Finished! :rocket:" >> $GITHUB_STEP_SUMMARY diff --git a/settings.sh b/settings.sh index 4161791..4f200fd 100644 --- a/settings.sh +++ b/settings.sh @@ -27,8 +27,10 @@ fi declare -A PACKAGES PACKAGES=( [qemu]=qemu-guest-agent - [locales]=qemu-guest-agent,locales-all - [extras]=qemu-guest-agent,locales-all,htop + [x_locales]=qemu-guest-agent,locales-all + [x_extras]=qemu-guest-agent,locales-all,htop + [locales]=locales-all + [extras]=htop ) if [[ "$1" != "" && -v "PACKAGES[$1]" ]]; then @@ -37,12 +39,6 @@ else IMAGE_PACKAGES="qemu-guest-agent" fi - - -### TO REMOVE -IMAGE_PACKAGES="htop" -### - # Export variables to github workflow if [[ -f "$GITHUB_ENV" ]]; then cat >> "$GITHUB_ENV" <<-EOF