fix: 打包前还原变更
This commit is contained in:
@@ -32,6 +32,14 @@ while [[ $# -gt 0 ]]; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# =================== build branch
|
||||||
|
echo
|
||||||
|
cd $BuildDir
|
||||||
|
git checkout .
|
||||||
|
git pull
|
||||||
|
git checkout $BuildBranch
|
||||||
|
git pull
|
||||||
|
|
||||||
# =================== Web
|
# =================== Web
|
||||||
echo
|
echo
|
||||||
# Determine if --web is passed in
|
# Determine if --web is passed in
|
||||||
@@ -48,12 +56,7 @@ fi
|
|||||||
|
|
||||||
# =================== deb/rpm
|
# =================== deb/rpm
|
||||||
echo
|
echo
|
||||||
cd $BuildDir
|
|
||||||
git checkout .
|
|
||||||
git pull
|
|
||||||
git checkout $BuildBranch
|
|
||||||
git pull
|
|
||||||
bash $BuildDir/pkg.sh --api -apiBranch $ApiBranch -v $VERSION
|
bash $BuildDir/pkg.sh --api -apiBranch $ApiBranch -v $VERSION
|
||||||
|
|
||||||
# bash pkg-front.sh --web -v 2.2503.2
|
# bash pkg-copy-front.sh --web -v 2.2503.2
|
||||||
# bash pkg-front.sh -v 2.2503.2
|
# bash pkg-copy-front.sh -v 2.2503.2
|
||||||
|
|||||||
@@ -37,6 +37,14 @@ done
|
|||||||
# clear tmp dir
|
# clear tmp dir
|
||||||
rm -rf ${BuildTmpDir} && mkdir -p ${BuildTmpDir}
|
rm -rf ${BuildTmpDir} && mkdir -p ${BuildTmpDir}
|
||||||
|
|
||||||
|
# =================== build branch
|
||||||
|
echo
|
||||||
|
cd $BuildDir
|
||||||
|
git checkout .
|
||||||
|
git pull
|
||||||
|
git checkout $BuildBranch
|
||||||
|
git pull
|
||||||
|
|
||||||
# =================== Web
|
# =================== Web
|
||||||
echo
|
echo
|
||||||
cd $WebDir
|
cd $WebDir
|
||||||
@@ -91,11 +99,6 @@ echo "===> vendor data copy to $output"
|
|||||||
|
|
||||||
# =================== build docker image
|
# =================== build docker image
|
||||||
echo
|
echo
|
||||||
cd $BuildDir
|
|
||||||
git checkout .
|
|
||||||
git pull
|
|
||||||
git checkout $BuildBranch
|
|
||||||
git pull
|
|
||||||
bash $BuildDir/build-docker.sh --version $VERSION --platform linux/amd64 --system ubuntu22.04
|
bash $BuildDir/build-docker.sh --version $VERSION --platform linux/amd64 --system ubuntu22.04
|
||||||
|
|
||||||
# Compile the front-end and back-end and then package the version
|
# Compile the front-end and back-end and then package the version
|
||||||
|
|||||||
@@ -36,6 +36,14 @@ while [[ $# -gt 0 ]]; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# =================== build branch
|
||||||
|
echo
|
||||||
|
cd $BuildDir
|
||||||
|
git checkout .
|
||||||
|
git pull
|
||||||
|
git checkout $BuildBranch
|
||||||
|
git pull
|
||||||
|
|
||||||
# =================== Web
|
# =================== Web
|
||||||
echo
|
echo
|
||||||
# Determine if --web is passed in
|
# Determine if --web is passed in
|
||||||
@@ -107,14 +115,9 @@ fi
|
|||||||
|
|
||||||
# =================== deb/rpm
|
# =================== deb/rpm
|
||||||
echo
|
echo
|
||||||
cd $BuildDir
|
|
||||||
git checkout .
|
|
||||||
git pull
|
|
||||||
git checkout $BuildBranch
|
|
||||||
git pull
|
|
||||||
bash $BuildDir/build.sh -v $VERSION
|
bash $BuildDir/build.sh -v $VERSION
|
||||||
|
|
||||||
# Compile the front-end and back-end and then package the version
|
# Compile the front-end and back-end and then package the version
|
||||||
# bash pkg-en.sh --web --api -v 2.2503.2
|
# bash pkg-remove-chinese.sh --web --api -v 2.2503.2
|
||||||
# Packaged version of just the last compiled file/build directory
|
# Packaged version of just the last compiled file/build directory
|
||||||
# bash pkg-en.sh -v 2.2503.2
|
# bash pkg-remove-chinese.sh -v 2.2503.2
|
||||||
|
|||||||
13
pkg.sh
13
pkg.sh
@@ -40,6 +40,14 @@ while [[ $# -gt 0 ]]; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# =================== build branch
|
||||||
|
echo
|
||||||
|
cd $BuildDir
|
||||||
|
git checkout .
|
||||||
|
git pull
|
||||||
|
git checkout $BuildBranch
|
||||||
|
git pull
|
||||||
|
|
||||||
# =================== Web
|
# =================== Web
|
||||||
echo
|
echo
|
||||||
# Determine if --web is passed in
|
# Determine if --web is passed in
|
||||||
@@ -94,11 +102,6 @@ fi
|
|||||||
|
|
||||||
# =================== deb/rpm
|
# =================== deb/rpm
|
||||||
echo
|
echo
|
||||||
cd $BuildDir
|
|
||||||
git checkout .
|
|
||||||
git pull
|
|
||||||
git checkout $BuildBranch
|
|
||||||
git pull
|
|
||||||
bash $BuildDir/build.sh -v $VERSION
|
bash $BuildDir/build.sh -v $VERSION
|
||||||
|
|
||||||
# Compile the front-end and back-end and then package the version
|
# Compile the front-end and back-end and then package the version
|
||||||
|
|||||||
Reference in New Issue
Block a user