Merge branch 'add_nightly_builds' into 'main'

Changed IS_NIGHTLY var checks to string from bool

See merge request veilid/veilid!291
This commit is contained in:
TC 2024-07-15 00:17:04 +00:00
commit a4ade6774b
4 changed files with 8 additions and 8 deletions

View File

@ -19,10 +19,10 @@ cp -f /veilid/target/$CARGO_ARCH/release/veilid-cli /dpkg/veilid-cli/usr/bin
# pack it up # pack it up
dpkg-deb -b /dpkg/veilid-cli/ dpkg-deb -b /dpkg/veilid-cli/
# Appropriatly name the package for STABLE or NIGHTLY release # Appropriatly name the package for STABLE or NIGHTLY release
if [ "$3" = true ] if [ "$3" = "true" ]
then then
mv /dpkg/veilid-cli.deb /dpkg/out/veilid-cli-$BUILD_DATE\_$ARCH.deb mv /dpkg/veilid-cli.deb /dpkg/out/veilid-cli-$BUILD_DATE\_$ARCH.deb
elif [ "$3" = false ] elif [ "$3" = "false" ]
then then
mv /dpkg/veilid-cli.deb /dpkg/out/veilid-cli-$CARGO_VERSION\_$ARCH.deb mv /dpkg/veilid-cli.deb /dpkg/out/veilid-cli-$CARGO_VERSION\_$ARCH.deb
else else

View File

@ -25,10 +25,10 @@ cp -f /veilid/target/$CARGO_ARCH/release/veilid-server /dpkg/veilid-server/usr/b
# pack it up # pack it up
dpkg-deb -b /dpkg/veilid-server/ dpkg-deb -b /dpkg/veilid-server/
# Appropriatly name the package for STABLE or NIGHTLY release # Appropriatly name the package for STABLE or NIGHTLY release
if [ "$3" = true ] if [ "$3" = "true" ]
then then
mv /dpkg/veilid-server.deb /dpkg/out/veilid-server-$BUILD_DATE\_$ARCH.deb mv /dpkg/veilid-server.deb /dpkg/out/veilid-server-$BUILD_DATE\_$ARCH.deb
elif [ "$3" = false ] elif [ "$3" = "false" ]
then then
mv /dpkg/veilid-server.deb /dpkg/out/veilid-server-$CARGO_VERSION\_$ARCH.deb mv /dpkg/veilid-server.deb /dpkg/out/veilid-server-$CARGO_VERSION\_$ARCH.deb
else else

View File

@ -7,10 +7,10 @@ CARGO_VERSION="$(/veilid/package/cargo_version.sh /veilid/veilid-cli/Cargo.toml)
# veilid-cli spec file # veilid-cli spec file
cp -rf /veilid/package/rpm/veilid-cli/veilid-cli.spec /root/rpmbuild/SPECS/ cp -rf /veilid/package/rpm/veilid-cli/veilid-cli.spec /root/rpmbuild/SPECS/
if [ "$3" = true ] if [ "$3" = "true" ]
then then
/veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-cli.spec RELEASE_VERSION $BUILD_DATE /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-cli.spec RELEASE_VERSION $BUILD_DATE
elif [ "$3" = false ] elif [ "$3" = "false" ]
/veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-cli.spec RELEASE_VERSION $CARGO_VERSION /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-cli.spec RELEASE_VERSION $CARGO_VERSION
else else
echo $3 "is not a valid state to determine if the build is STABLE or NIGHTLY" echo $3 "is not a valid state to determine if the build is STABLE or NIGHTLY"

View File

@ -8,10 +8,10 @@ CARGO_VERSION="$(/veilid/package/cargo_version.sh /veilid/veilid-server/Cargo.to
# veilid-server spec file # veilid-server spec file
cp -rf /veilid/package/rpm/veilid-server/veilid-server.spec /root/rpmbuild/SPECS/ cp -rf /veilid/package/rpm/veilid-server/veilid-server.spec /root/rpmbuild/SPECS/
# Select CARGO_VERSION for STABLE releases or BUILD_DATE for NIGHTLY releases # Select CARGO_VERSION for STABLE releases or BUILD_DATE for NIGHTLY releases
if [ "$3" = true ] if [ "$3" = "true" ]
then then
/veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec RELEASE_VERSION $BUILD_DATE /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec RELEASE_VERSION $BUILD_DATE
elif [ "$3" = false ] elif [ "$3" = "false" ]
/veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec RELEASE_VERSION $CARGO_VERSION /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec RELEASE_VERSION $CARGO_VERSION
else else
echo $3 "is not a valid state to determine if the build is STABLE or NIGHTLY" echo $3 "is not a valid state to determine if the build is STABLE or NIGHTLY"