michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix to correctly handle builds for multiple types

Browse Source
This commit is contained in:
Ilia Ross
2024-12-31 03:18:44 +02:00
parent ee994bef2f
commit 2a81aabf96
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/build/build-deb-package.bash vendored
View File

@@ -71,8 +71,10 @@ build_prod() {
# Print package version
echo -n " package version: "
# Get latest product version (theme vs product); expects to start in theme
# repo and switch to product repo internally
# Switch to product directory explicitly
cd "$root_prod" || exit 1
# Get latest product version (theme vs product)
date_version=$(get_latest_commit_date_version "$root_prod")
# Handle other params

6
.github/build/build-rpm-package.bash vendored
View File

@@ -70,8 +70,10 @@ build_prod() {
# Print package version
echo -n " package version: "
# Get latest product version (theme vs product); expects to start in theme
# repo and switch to product repo internally
# Switch to product directory explicitly
cd "$root_prod" || exit 1
# Get latest product version (theme vs product)
date_version=$(get_latest_commit_date_version "$root_prod")
# Handle other params

17
.github/build/functions.bash vendored
View File

@@ -201,13 +201,16 @@ get_latest_commit_date_version() {
local max_prod
local highest_version
local root_prod="$1"
theme_version=$(git log -n1 --pretty='format:%cd' --date=format:'%Y%m%d%H%M')
cd "$root_prod" || exit 1
prod_version=$(git log -n1 --pretty='format:%cd' --date=format:'%Y%m%d%H%M')
max_prod=("$theme_version" "$prod_version")
highest_version=$(max "${max_prod[@]}")
echo "$highest_version"
local root_theme="$root_prod/authentic-theme"
(
cd "$root_theme" || exit 1
theme_version=$(git log -n1 --pretty='format:%cd' --date=format:'%Y%m%d%H%M')
cd "$root_prod" || exit 1
prod_version=$(git log -n1 --pretty='format:%cd' --date=format:'%Y%m%d%H%M')
max_prod=("$theme_version" "$prod_version")
highest_version=$(max "${max_prod[@]}")
echo "$highest_version"
)
}
# Pull project repo and theme