Take version from Cargo workspace

kiron1 · Nov 25, 2023 · 0bf7d98 · 0bf7d98
1 parent f0abe61
commit 0bf7d98
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/bump_version.yaml b/.github/workflows/bump_version.yaml
@@ -31,11 +31,7 @@ jobs:
 
       - name: Bump version of proxydetox
         run: |
-          cargo set-version -p proxydetox --bump ${{ github.event.inputs.release_kind }}
-
-      - name: Bump version of proxydetoxlib
-        run: |
-          cargo set-version -p proxydetoxlib --bump ${{ github.event.inputs.release_kind }}
+          cargo set-version --bump ${{ github.event.inputs.release_kind }}
 
       - name: Cargo update
         run: |

diff --git a/Cargo.toml b/Cargo.toml
@@ -19,6 +19,11 @@ default-members = [
     "spnego",
 ]
 
+[workspace.package]
+version = "0.7.3"
+edition = "2021"
+homepage = "https://proxydetox.colorto.cc/"
+
 [workspace.dependencies]
 base64 = "0.21"
 boa_engine = { version = "0.17", features = ["annex-b"] }

diff --git a/proxydetox/Cargo.toml b/proxydetox/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "proxydetox"
-version = "0.7.3"
+version.workspace = true
 edition = "2021"
-homepage = "https://proxydetox.colorto.cc/"
+homepage.workspace = true
 
 [features]
 default = ["negotiate"]

diff --git a/proxydetoxlib/Cargo.toml b/proxydetoxlib/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "proxydetoxlib"
-version = "0.7.3"
+version.workspace = true
 edition = "2021"
-homepage = "https://proxydetox.colorto.cc/"
+homepage.workspace = true
 
 [features]
 default = ["negotiate"]

diff --git a/tools/mkdeb.sh b/tools/mkdeb.sh
@@ -45,11 +45,11 @@ cargo install \
 sed -e "s|\${prefix}|${prefix}|" "${root}/debian/proxydetox.service" \
   >"${workdir}/lib/systemd/user/proxydetox.service"
 
-version=$(sed -n 's/^version\s*=\s*"\([0-9.]*\)"/\1/p' "${root}/proxydetox/Cargo.toml")
-echo "version=${version}" >> "${GITHUB_OUTPUT:-/dev/stdout}"
+version=$("${root}/tools/version")
+echo "version=${version}" | tee -a "${GITHUB_OUTPUT:-/dev/stdout}"
 
 pkgfile=proxydetox-${version}-x86_64-${distname}.deb
-echo "pkgfile=${pkgfile}" >> "${GITHUB_OUTPUT:-/dev/stdout}"
+echo "pkgfile=${pkgfile}" | tee -a "${GITHUB_OUTPUT:-/dev/stdout}"
 
 sed -e "s/\${version}/${version}/" "${root}/debian/control" >"${workdir}/DEBIAN/control"
 for f in postinst postrm; do

diff --git a/tools/mkpkg.sh b/tools/mkpkg.sh
@@ -47,10 +47,10 @@ install -v -m 0644 "${root}/pkg/macos/40-proxydetox" "${workdir}/etc/paths.d/"
 install -d "${workdir}/${prefix}/libexec/"
 install -v "${setproxy_helper}" "${workdir}/${prefix}/libexec/setproxy_helper"
 
-version=$(sed -n 's/^version[ \t]*=[ \t]*"\([0-9.]*\)"/\1/p' "${root}/proxydetox/Cargo.toml")
+version=$("${root}/tools/version")
 pkgfile=proxydetox-${version}-${arch}-apple-darwin.pkg
-echo "version=${version}" >> "${GITHUB_OUTPUT:-/dev/stdout}"
-echo "pkgfile=${pkgfile}" >> "${GITHUB_OUTPUT:-/dev/stdout}"
+echo "version=${version}" | tee -a "${GITHUB_OUTPUT:-/dev/stdout}"
+echo "pkgfile=${pkgfile}" | tee -a "${GITHUB_OUTPUT:-/dev/stdout}"
 
 echo "Building ${pkgfile}"
 pkgbuild \