Fix package versions, and audio hardware profile default.

SteamFork · Jul 22, 2024 · ba6b3ab · ba6b3ab
1 parent db0d3ca
commit ba6b3ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,17 +41,16 @@ jobs:
           tag: "${{ steps.tag.outputs.tag }}"
           body: |
             ## Downloads
-            This release contains a snapshot of the repository tree.  Downloadable images are available at [SteamFork.org](https://www.steamfork.org/images/installer/) with updates available OTA.  A download link to the latest installation image can be found below.
+            This release contains a snapshot of the repository tree and a list of packages and their versions in this release.  Downloadable images are available at [SteamFork.org](https://www.steamfork.org/images/installer/) with updates available OTA.  A download link to the latest installation image can be found below.
 
             | Branch | URL | Checksum |
             | -- | -- | -- |
             | Stable | [LATEST](https://www.steamfork.org/images/installer/steamfork-rel-latest-x86_64.iso) | [CHECKSUM](https://www.steamfork.org/images/installer/steamfork-rel-latest-x86_64.iso.sha256) |
 
             For installation instructions and other documentation, visit the [main project page](https://github.com/SteamFork).
 
-            ## Package Versions
-            $(cat release/images/rel/images/packages.md)
           prerelease: false
+          artifacts: release/images/rel/images/package-versions.txt
           draft: false
           token: ${{ secrets.GITHUB_TOKEN }}
           owner: SteamFork

diff --git a/rootfs/steamfork/build-image b/rootfs/steamfork/build-image
@@ -265,13 +265,14 @@ echo "(4.10/6) Fix runtime audio configuration."
     arch-chroot ${ROOT_WORKDIR} sed -i 's~multi-user.target~local-fs.target~g' /usr/lib/systemd/system/${AUDIO_SERVICE}-sysconf.service
     arch-chroot ${ROOT_WORKDIR} systemctl enable ${AUDIO_SERVICE}-sysconf.service
   done
+  PRE_PW_WD=$(pwd)
   for PW_PATH in pipewire wireplumber
   do
     rm -f ${ROOT_WORKDIR}/usr/share/${PW_PATH}/hardware-profiles/default
-    cd ${ROOT_WORKDIR}/usr/share/${PW_PATJ}/hardware-profiles/
+    cd ${ROOT_WORKDIR}/usr/share/${PW_PATH}/hardware-profiles/
     ln -sf valve-galileo default
-    cd -
   done
+  cd ${PRE_PW_WD}
 
 echo "(4.11/6) Enable systemd-resolved."
 rm -f ${ROOT_WORKDIR}/etc/resolv.conf
@@ -289,11 +290,11 @@ do
 done
 
 echo "(4.13/6) Compile installed package list..."
-cat <<EOF >${OUTPUT}/packages.md
+cat <<EOF >${OUTPUT}/package-versions.txt
 |Package|Version|
 | -- | -- |
 EOF
-arch-chroot ${ROOT_WORKDIR} pacman -Q | awk '{print "|"$1"|"$2"|"}' >>${OUTPUT}/packages.md
+arch-chroot ${ROOT_WORKDIR} pacman -Q | awk '{print "|"$1"|"$2"|"}' >>${OUTPUT}/package-versions.txt
 
 echo "(5/6) Stop doing things in container..."
 # Cleanup