Skip to content

Commit 33b361a

Browse files
author
Brean
committed
fix: Enhance package version retrieval in release workflow to fallback on Cargo.toml
1 parent 0386ea6 commit 33b361a

1 file changed

Lines changed: 16 additions & 4 deletions

File tree

.github/workflows/release.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,20 @@ jobs:
9797
# Create Debian package
9898
- name: Create Debian package
9999
run: |
100-
# Get version from tag
101-
VERSION=${GITHUB_REF#refs/tags/v}
100+
# Get version from tag or use Cargo.toml version
101+
if [[ $GITHUB_REF == refs/tags/v* ]]; then
102+
VERSION=${GITHUB_REF#refs/tags/v}
103+
else
104+
VERSION=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
105+
fi
102106
103107
# Extract package info from Cargo.toml
104108
DESCRIPTION=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].description')
105109
AUTHORS=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].authors[0]')
106110
REPOSITORY=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].repository')
107111
112+
echo "Building Debian package for version: $VERSION"
113+
108114
# Copy binary for deb package
109115
cp target/x86_64-unknown-linux-musl/release/${BINARY_NAME} dist/deb/usr/bin/
110116
@@ -131,15 +137,21 @@ jobs:
131137
# Install rpm tools
132138
sudo apt-get install -y rpm
133139
134-
# Get version from tag
135-
VERSION=${GITHUB_REF#refs/tags/v}
140+
# Get version from tag or use Cargo.toml version
141+
if [[ $GITHUB_REF == refs/tags/v* ]]; then
142+
VERSION=${GITHUB_REF#refs/tags/v}
143+
else
144+
VERSION=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
145+
fi
136146
137147
# Extract package info from Cargo.toml
138148
DESCRIPTION=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].description')
139149
AUTHORS=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].authors[0]')
140150
REPOSITORY=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].repository')
141151
LICENSE=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].license')
142152
153+
echo "Building RPM package for version: $VERSION"
154+
143155
# Create RPM spec file
144156
mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
145157

0 commit comments

Comments
 (0)