Merge pull request #28 from mizunashi-mana/fix-version

Fix version checking

.github/workflows/build-deb.yml

@@ -69,9 +69,8 @@ jobs:
                     DEST_PREFIX: ${{ matrix.distro_base }}-${{ matrix.distro }}-${{ matrix.arch }}
 
             -   name: Test deb version
-                if: startsWith(github.ref, 'refs/tags/')
                 run: |
-                    env TRACE=true ./tests/test-version "$GITHUB_REF_NAME" ./dest/*.deb
+                    env TRACE=true ./tests/test-version ./dest/*.deb
 
             -   name: Archive deb artifact
                 uses: actions/upload-artifact@v3

debian/files/changelog

@@ -1,4 +1,4 @@
-firefish (20240504-d202405040003+release) unstable; urgency=high
+firefish (20240504-d202405050004+release) unstable; urgency=high
 
   * Include critical security fixes
   * Upstream Release Note: https://firefish.dev/firefish/firefish/-/blob/v20240430/docs/changelog.md

envs/common.make

@@ -2,8 +2,7 @@ include envs/params.make
 
 PKG_VERSION_FIREFISH?=20240504
 PKG_VERSION_DEB_MAIN=$(subst -,+,$(PKG_VERSION_FIREFISH))
-PKG_VERSION_DEB?=$(PKG_VERSION_DEB_MAIN)-d202405050003+release
+PKG_VERSION_DEB?=$(PKG_VERSION_DEB_MAIN)-d202405050004+release
 
 FIREFISH_SOURCE_GIT_REPO?=https://firefish.dev/firefish/firefish.git/
 FIREFISH_SOURCE_GIT_COMMIT_REF?=v$(PKG_VERSION_FIREFISH)
-

repo/Dockerfile

@@ -18,5 +18,3 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y \
 apt-get clean
 rm -rf /var/lib/apt/lists/*
 EOT
-
-COPY scripts/build-repo-by-aptly /usr/local/bin/build-repo-by-aptly

tests/test-version

@@ -3,8 +3,9 @@
 set -euo pipefail
 [ "${TRACE:-false}" = 'true' ] && set -x
 
-GITHUB_TAG_NAME="$1"
-DEB_FILE_PATH="$2"
+DEB_FILE_PATH="$1"
+
+make version
 
 DPKG_DEB_VERSION="$(dpkg-deb --show "$DEB_FILE_PATH" | awk '{print $2}')"
-[ "v$DPKG_DEB_VERSION" = "$GITHUB_TAG_NAME" ]
+[ "$DPKG_DEB_VERSION" = "$(cat VERSION.txt)" ]