Consolidate deb templates

Signed-off-by: Marcus Crane <[email protected]>
marcus-crane · Dec 5, 2023 · 0593287 · 0593287
1 parent e5d11d1
commit 0593287
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 23 deletions.
diff --git a/.github/workflows/release-linux.yaml b/.github/workflows/release-linux.yaml
@@ -62,10 +62,11 @@ jobs:
       - name: Package up deb file
         shell: bash
         run: |
-          mv build/bin/october build/linux/october_0.0.0_amd64/usr/local/bin/
+          mv build/bin/october build/linux/october_0.0.0_ARCH/usr/local/bin/
           cd build/linux
-          mv october_0.0.0_amd64 "october_${{ steps.normalise_version.outputs.version }}_amd64"
-          sed -i 's/0.0.0/${{ steps.normalise_version.outputs.version }}/g' "october_${{ steps.normalise_version.outputs.version }}_amd64/DEBIAN/control"
+          sed -i 's/0.0.0/${{ steps.normalise_version.outputs.version }}/g' "october_0.0.0_ARCH/DEBIAN/control"
+          sed -i 's/ARCH/amd64/g' "october_0.0.0_ARCH/DEBIAN/control"
+          mv october_0.0.0_ARCH "october_${{ steps.normalise_version.outputs.version }}_amd64"
           dpkg-deb --build "october_${{ steps.normalise_version.outputs.version }}_amd64"
 
       - name: Get latest release from API

diff --git a/.../linux/october_0.0.0_amd64/DEBIAN/control → ...d/linux/october_0.0.0_ARCH/DEBIAN/control b/.../linux/october_0.0.0_amd64/DEBIAN/control → ...d/linux/october_0.0.0_ARCH/DEBIAN/control
@@ -2,7 +2,7 @@ Package: october
 Version: 0.0.0
 Section: base
 Priority: optional
-Architecture: amd64
+Architecture: ARCH
 Depends: libgtk-3-dev, libwebkit2gtk-4.0-dev
 Maintainer: Marcus Crane <[email protected]>
 Homepage: https://october.utf9k.net

diff --git a/...ctober_0.0.0_amd64/usr/local/bin/.gitkeep → ...october_0.0.0_ARCH/usr/local/bin/.gitkeep b/...ctober_0.0.0_amd64/usr/local/bin/.gitkeep → ...october_0.0.0_ARCH/usr/local/bin/.gitkeep
diff --git a/...64/usr/share/applications/october.desktop → ...CH/usr/share/applications/october.desktop b/...64/usr/share/applications/october.desktop → ...CH/usr/share/applications/october.desktop
diff --git a/...re/icons/hicolor/512x512/apps/october.png → ...re/icons/hicolor/512x512/apps/october.png b/...re/icons/hicolor/512x512/apps/october.png → ...re/icons/hicolor/512x512/apps/october.png
diff --git a/build/linux/october_0.0.0_arm64/DEBIAN/control b/build/linux/october_0.0.0_arm64/DEBIAN/control
diff --git a/build/linux/october_0.0.0_arm64/usr/local/bin/.gitkeep b/build/linux/october_0.0.0_arm64/usr/local/bin/.gitkeep
diff --git a/build/linux/october_0.0.0_arm64/usr/share/applications/october.desktop b/build/linux/october_0.0.0_arm64/usr/share/applications/october.desktop
diff --git a/build/linux/october_0.0.0_arm64/usr/share/icons/hicolor/512x512/apps/october.png b/build/linux/october_0.0.0_arm64/usr/share/icons/hicolor/512x512/apps/october.png