WFC/build.wfc
2
0
Fork 0
Code Activity

fix: build enhancement

Browse Source
This commit is contained in:
zhangsz
2025-02-24 14:05:48 +08:00
parent 9ba56e815f
commit 69d4a61177
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@@ -87,9 +87,5 @@ yarn.lock
release/debs/*.deb release/debs/*.deb
release/tars/*.tar.gz release/tars/*.tar.gz
release/src-tars/*.tar.gz release/src-tars/*.tar.gz
debbuild debbuild/etc
!debbuild/DEBIAN/control debbuild/opt
!debbuild/DEBIAN/postinst
!debbuild/DEBIAN/preinst
!debbuild/DEBIAN/postrm
!debbuild/DEBIAN/prerm

5
bin/build.sh
View File

@@ -45,6 +45,7 @@ pre-build-tar(){
mkdir -p ${ReleseDir}/tars mkdir -p ${ReleseDir}/tars
fi fi
source ${BuildRootDir}/bin/control.sh source ${BuildRootDir}/bin/control.sh
cd ${BuildRootDir}
sed -i "s/YYYYMMDD/${RelDate}/" ${BuildDockerDir}/env/wfc-release sed -i "s/YYYYMMDD/${RelDate}/" ${BuildDockerDir}/env/wfc-release
git update-index --assume-unchanged ${BuildDockerDir}/env/wfc-release git update-index --assume-unchanged ${BuildDockerDir}/env/wfc-release
} }
@@ -72,8 +73,9 @@ pre-build-deb(){
if [ ! -d ${DebSystemdDir} ]; then if [ ! -d ${DebSystemdDir} ]; then
mkdir -p ${DebSystemdDir} mkdir -p ${DebSystemdDir}
fi fi
cd ${BuildRootDir}
sed -i "s/YYYYMMDD/${RelDate}/" ${BuildDockerDir}/env/wfc-release sed -i "s/YYYYMMDD/${RelDate}/" ${BuildDockerDir}/env/wfc-release
--assume-unchanged ${BuildDockerDir}/env/wfc-release git update-index --assume-unchanged ${BuildDockerDir}/env/wfc-release
} }
build-extras(){ build-extras(){
@@ -202,6 +204,7 @@ post-build(){
# if [ -f ${TmpEnvFile} ] && [ ! -f ${BuildDockerDir}/.env ]; then # if [ -f ${TmpEnvFile} ] && [ ! -f ${BuildDockerDir}/.env ]; then
# mv -f ${TmpEnvFile} ${BuildDockerDir}/.env # mv -f ${TmpEnvFile} ${BuildDockerDir}/.env
# fi # fi
cd ${BuildRootDir}
git checkout ${BuildDockerDir}/env/wfc-release git checkout ${BuildDockerDir}/env/wfc-release
git update-index --no-assume-unchanged ${BuildDockerDir}/env/wfc-release git update-index --no-assume-unchanged ${BuildDockerDir}/env/wfc-release
} }

5
build/bin/wfcsetup.sh
View File

@@ -183,8 +183,9 @@ EOF"
while [ $elapsed -lt $timeout ]; do while [ $elapsed -lt $timeout ]; do
health_status=$(docker inspect --format='{{.State.Health.Status}}' $mysql_container_name) health_status=$(docker inspect --format='{{.State.Health.Status}}' $mysql_container_name)
if [ "$health_status" == "healthy" ]; then if [ "$health_status" == "healthy" ]; then
echo "Upgrade database: " echo "Container $mysql_container_name is healthy"
${wfc_work_dir}/bin/wfcupgdb.sh all echo "Executing database upgrade scripts ..."
${wfc_work_dir}/bin/wfcupgrade.sh
exit 0 exit 0
fi fi
sleep $interval sleep $interval

2
debbuild/DEBIAN/control
View File

@@ -1,5 +1,5 @@
Package: WFC Package: WFC
Version: 1.0.7 Version: 1.0.8
Section: WFC Section: WFC
Prioritt: optional Prioritt: optional
Architecture: amd64 Architecture: amd64

2
debbuild/DEBIAN/prerm
View File

@@ -4,4 +4,4 @@ wfc_bin_dir=/opt/wfc/bin
${wfc_bin_dir}/wfccontrol.sh stop ${wfc_bin_dir}/wfccontrol.sh stop
${wfc_bin_dir}/wfcsetup.sh rm all ${wfc_bin_dir}/wfcsetup.sh rm all
exit 0