Merge pull request #16 from mizunashi-mana/ready-to-release-beta

Bump version
mizunashi-mana · Dec 6, 2023 · 38eca0c · 38eca0c
2 parents e27b3c2 + 0d70552
commit 38eca0c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 26 deletions.
diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml
@@ -13,15 +13,18 @@ jobs:
         strategy:
             matrix:
                 include:
-                    -   distro_base: "debian"
-                        distro: "bullseye"
-                        arch: amd64
                     -   distro_base: "debian"
                         distro: "bookworm"
                         arch: amd64
                     -   distro_base: "ubuntu"
                         distro: "jammy"
                         arch: amd64
+                    -   distro_base: "debian"
+                        distro: "bullseye"
+                        arch: amd64
+                    -   distro_base: "ubuntu"
+                        distro: "focal"
+                        arch: amd64
 
         steps:
             -   name: Checkout repository
@@ -113,25 +116,25 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         runs-on: ubuntu-latest
         steps:
-            -   name: Download deb for Debian bullseye / amd64
+            -   name: Download deb for Debian bookworm / amd64
                 uses: actions/download-artifact@v3
                 with:
-                    name: deb-debian-bullseye-amd64
+                    name: deb-debian-bookworm-amd64
 
-            -   name: Download deb for Debian bookworm / amd64
+            -   name: Download deb for Ubuntu jammy / amd64
                 uses: actions/download-artifact@v3
                 with:
-                    name: deb-debian-bookworm-amd64
+                    name: deb-ubuntu-jammy-amd64
 
-            -   name: Download deb for Debian bookworm / arm64
+            -   name: Download deb for Debian bullseye / amd64
                 uses: actions/download-artifact@v3
                 with:
-                    name: deb-debian-bookworm-arm64
+                    name: deb-debian-bullseye-amd64
 
-            -   name: Download deb for Ubuntu jammy / amd64
+            -   name: Download deb for Ubuntu focal / amd64
                 uses: actions/download-artifact@v3
                 with:
-                    name: deb-ubuntu-jammy-amd64
+                    name: deb-ubuntu-focal-amd64
 
             -   name: Release
                 uses: softprops/action-gh-release@v1

diff --git a/README.md b/README.md
@@ -2,16 +2,16 @@
 
 Free to install dev dependencies, build with Rust and use pm2. Run by systemd with security sandbox.
 
-## Debian
+## Debian / Ubuntu
 
-Currently, supports bookworm amd64 (and x86_64) only.
+Currently, supports amd64 (x86_64) architecture only.
 
 How to run:
 
 1. Install nodejs v20: https://github.com/nodesource/distributions#debinstall
 2. Download deb from https://github.com/mizunashi-mana/firefish-dist-pkg/releases.
-3. Install deb by `apt install ./firefish_*.deb`.
-4. Edit `/etc/firefish/default.yml` and restart firefish by `systemctl restart firefish`.
+3. Install deb by `apt install ./*_firefish.deb`.
+4. Edit `/etc/firefish/config.yml` and restart firefish by `systemctl restart firefish`.
 
 ## License Notice
 

diff --git a/deb/Dockerfile b/deb/Dockerfile
@@ -16,22 +16,32 @@ FROM base AS builder
 WORKDIR "${WORK_DIR}"
 
 COPY deb/scripts "${WORK_DIR}/scripts"
-
-RUN <<EOT
-scripts/install-build-deps
-
-apt-get clean
-rm -rf \
-    /var/lib/apt/lists/*
-EOT
-
 COPY common "${WORK_DIR}/common"
 COPY deb/files "${WORK_DIR}/files"
 COPY deb/Makefile "${WORK_DIR}/Makefile"
 
 RUN <<EOT
+scripts/install-build-deps
+
 source "$HOME/.cargo/env"
 make firefish.deb
+
+apt-get remove -y \
+    wget \
+    dh-make \
+    make \
+    rsync \
+    nodejs
+apt-get autoremove -y
+apt-get clean
+rm -rf \
+    ~/.npm \
+    ~/.local \
+    ~/.cache \
+    ~/.cargo \
+    ~/.rustup \
+    pkg/firefish-*/packages/backend/native-utils/target \
+    /var/lib/apt/lists/*
 EOT
 
 FROM base AS debcontainer

diff --git a/deb/files/changelog b/deb/files/changelog
@@ -1,4 +1,4 @@
-firefish (1.0.5+rc-d202312050000+alpha) UNRELEASED; urgency=medium
+firefish (1.0.5+rc-d202312060000+beta) UNRELEASED; urgency=medium
 
   * Renewal release of Debian packaging.
   * Use dh-make and change version policy.

diff --git a/deb/files/control b/deb/files/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Mizunashi Mana <contact@mizunashi.work>
 Rules-Requires-Root: no
 Build-Depends:
-  debhelper-compat (= 13),
+  debhelper-compat (= 12),
   rsync,
   nodejs (>= 20.0.0),
 Standards-Version: 4.6.2