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 use a consistent flag name

Browse Source
This commit is contained in:
Ilia Ross
2024-12-29 03:28:54 +02:00
parent 09a00bd839
commit 9ac2a45822
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/build/deb.sh vendored
View File

@@ -16,7 +16,7 @@
#
# # Pull and build devel versions
# # of both Webmin and Usermin
# ./deb.sh --devel
# ./deb.sh --testing
#
# # Pull and build production Webmin version 2.101, forcing
# # release version 3, displaying detailed output
@@ -42,7 +42,7 @@ build_prod() {
# Pack with English only in devel builds
local english_only=0
if [[ "'$*'" == *"--devel"* ]]; then
if [[ "'$*'" == *"--testing"* ]]; then
english_only=1
fi
@@ -113,7 +113,7 @@ build_prod() {
if [ -z "$ver" ]; then
ver=$(get_current_repo_tag)
fi
if [[ "'$*'" == *"--devel"* ]]; then
if [[ "'$*'" == *"--testing"* ]]; then
ver="$ver.$date_version"
# Set actual product version
echo "${ver}" >"version"
@@ -194,8 +194,6 @@ build_prod() {
echo "Preparing built files for upload .."
cmd="cp -f $root_prod/tarballs/${prod}-${ver}*\.tar.gz $root_repos/${prod}-latest.tar.gz $verbosity_level"
eval "$cmd"
cmd="echo $ver-$rel \($date\) > $root_repos/${prod}-latest.version $verbosity_level_to_file"
eval "$cmd"
cmd="find $root_apt -name ${prod}_${ver}${relval}*\.deb -exec mv '{}' $root_repos \; $verbosity_level"
eval "$cmd"
cmd="mv -f $root_repos/${prod}_${ver}${relval}*\.deb $root_repos/${prod}-latest.deb $verbosity_level"

8
.github/build/rpm.sh vendored
View File

@@ -16,7 +16,7 @@
#
# # Pull and build devel versions
# # of both Webmin and Usermin
# ./rpm.sh --devel
# ./rpm.sh --testing
#
# # Pull and build production Webmin version 2.101, forcing
# # release version 3, displaying detailed output
@@ -42,7 +42,7 @@ build_prod() {
# Pack with English only in devel builds
local english_only=0
if [[ "'$*'" == *"--devel"* ]]; then
if [[ "'$*'" == *"--testing"* ]]; then
english_only=1
fi
@@ -110,7 +110,7 @@ build_prod() {
if [ -z "$ver" ]; then
ver=$(get_current_repo_tag)
fi
if [[ "'$*'" == *"--devel"* ]]; then
if [[ "'$*'" == *"--testing"* ]]; then
ver="$ver.$date_version"
# Set actual product version
echo "${ver}" >"version"
@@ -206,8 +206,6 @@ build_prod() {
echo "Preparing built files for upload .."
cmd="cp -f $root_prod/tarballs/$prod-$ver*\.tar.gz $root_repos/${prod}-latest.tar.gz $verbosity_level"
eval "$cmd"
cmd="echo $ver-$rel \($date\) > $root_repos/$prod-latest.version"
eval "$cmd"
cmd="find $root_rpms -name $prod-$ver-$rel*\.rpm -exec mv '{}' $root_repos \; $verbosity_level"
eval "$cmd"
cmd="mv -f $root_repos/$prod-$ver-$rel*\.rpm $root_repos/${prod}-latest.rpm $verbosity_level"

4
.github/workflows/webmin.dev-deploy-webmin-package.yml vendored
View File

@@ -26,5 +26,5 @@ jobs:
ENV_BUILD__CLOUD_UPLOAD_SSH_HOST: ${{ secrets.WEBMIN_DEV__IP_ADDR }}
working-directory: ./.github/build
run: |-
./deb.sh webmin --devel
./rpm.sh webmin --devel
./deb.sh webmin --testing
./rpm.sh webmin --testing