Rearrange ordering of git commands to make GitHub CI happy.
parent
034bf2954b
commit
219e37bd9e
|
@ -29,7 +29,7 @@ cd $FREEDVGUIDIR
|
|||
if [ ! -d codec2 ]; then
|
||||
git clone https://github.com/drowe67/codec2.git
|
||||
fi
|
||||
cd codec2 && git checkout $CODEC2_BRANCH && git pull
|
||||
cd codec2 && git switch - && git pull && git checkout $CODEC2_BRANCH
|
||||
mkdir -p build_linux && cd build_linux && rm -Rf * && cmake .. && make
|
||||
|
||||
# OK, build and test LPCNet
|
||||
|
@ -37,7 +37,7 @@ cd $FREEDVGUIDIR
|
|||
if [ ! -d LPCNet ]; then
|
||||
git clone https://github.com/drowe67/LPCNet.git
|
||||
fi
|
||||
cd $LPCNETDIR && git checkout $LPCNET_BRANCH && git pull
|
||||
cd $LPCNETDIR && git switch - && git pull && git checkout $LPCNET_BRANCH
|
||||
mkdir -p build_linux && cd build_linux && rm -Rf *
|
||||
cmake -DCODEC2_BUILD_DIR=$CODEC2DIR/build_linux ..
|
||||
make
|
||||
|
|
|
@ -35,7 +35,7 @@ cd $FREEDVGUIDIR
|
|||
if [ ! -d codec2 ]; then
|
||||
git clone https://github.com/drowe67/codec2.git
|
||||
fi
|
||||
cd codec2 && git checkout $CODEC2_BRANCH && git pull
|
||||
cd codec2 && git switch - && git pull && git checkout $CODEC2_BRANCH
|
||||
mkdir -p build_osx && cd build_osx && rm -Rf * && cmake -DBUILD_OSX_UNIVERSAL=1 .. && make -j4
|
||||
|
||||
# OK, build and test LPCNet
|
||||
|
@ -43,7 +43,7 @@ cd $FREEDVGUIDIR
|
|||
if [ ! -d LPCNet ]; then
|
||||
git clone https://github.com/drowe67/LPCNet.git
|
||||
fi
|
||||
cd $LPCNETDIR && git checkout $LPCNET_BRANCH && git pull
|
||||
cd $LPCNETDIR && git switch - && git pull && git checkout $LPCNET_BRANCH
|
||||
mkdir -p build_osx && cd build_osx && rm -Rf *
|
||||
cmake -DCODEC2_BUILD_DIR=$CODEC2DIR/build_osx -DBUILD_OSX_UNIVERSAL=1 ..
|
||||
make -j4
|
||||
|
|
|
@ -26,14 +26,14 @@ LPCNET_BRANCH=v0.2
|
|||
# First build and install vanilla codec2 as we need -lcodec2 to build LPCNet
|
||||
cd $FREEDVGUIDIR
|
||||
git clone https://github.com/drowe67/codec2.git
|
||||
cd codec2 && git checkout $CODEC2_BRANCH && git pull
|
||||
cd codec2 && git switch - && git pull && git checkout $CODEC2_BRANCH
|
||||
mkdir -p $BUILD_DIR && cd $BUILD_DIR && rm -Rf *
|
||||
$CMAKE .. && make
|
||||
|
||||
# OK, build and test LPCNet
|
||||
cd $FREEDVGUIDIR
|
||||
git clone https://github.com/drowe67/LPCNet.git
|
||||
cd $LPCNETDIR && git checkout $LPCNET_BRANCH && git pull
|
||||
cd $LPCNETDIR && git switch - && git pull && git checkout $LPCNET_BRANCH
|
||||
mkdir -p $BUILD_DIR && cd $BUILD_DIR && rm -Rf *
|
||||
$CMAKE -DCODEC2_BUILD_DIR=$CODEC2DIR/$BUILD_DIR ..
|
||||
make
|
||||
|
|
Loading…
Reference in New Issue