Refactor these shell scripts.

Bumped up the version of MariaDB for Travis.
This commit is contained in:
Azareal 2018-11-22 18:50:53 +10:00
parent 45465ef210
commit 3079080acf
5 changed files with 7 additions and 26 deletions

View File

@ -22,4 +22,4 @@ script: ./run-linux-tests
after_script: after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
addons: addons:
mariadb: '10.1' mariadb: '11.0'

View File

@ -5,18 +5,12 @@ rm -f tmpl_client/template_*.go
rm -f ./Gosora rm -f ./Gosora
echo "Building the router generator" echo "Building the router generator"
cd ./router_gen go build -o RouterGen "./router_gen"
go build -o RouterGen
mv ./RouterGen ..
cd ..
echo "Running the router generator" echo "Running the router generator"
./RouterGen ./RouterGen
echo "Building the query generator" echo "Building the query generator"
cd ./cmd/query_gen go build -o QueryGen "./cmd/query_gen"
go build -o QueryGen
mv ./QueryGen ../..
cd ../..
echo "Running the query generator" echo "Running the query generator"
./QueryGen ./QueryGen
@ -25,7 +19,4 @@ go generate
go build -o Gosora go build -o Gosora
echo "Building the installer" echo "Building the installer"
cd ./install go build -o Installer "./install"
go build -o Installer
mv ./Installer ..
cd ..

View File

@ -9,9 +9,6 @@ git pull origin master
git stash apply git stash apply
echo "Patching Gosora" echo "Patching Gosora"
cd ./patcher
go generate go generate
go build -o Patcher go build -o Patcher "./patcher"
mv ./Patcher ..
cd ..
./Patcher ./Patcher

View File

@ -1,7 +1,4 @@
echo "Building the patcher" echo "Building the patcher"
cp ./schema/schema.json ./schema/lastSchema.json cp ./schema/schema.json ./schema/lastSchema.json
cd ./patcher
go generate go generate
go build -o Patcher go build -o Patcher "./patcher"
mv ./Patcher ..
cd ..

View File

@ -2,11 +2,7 @@ echo "Installing the dependencies"
go get go get
echo "Building the installer" echo "Building the installer"
cd ./install go build -o Installer "./install"
go generate
go build -o Installer
mv ./Installer ..
cd ..
echo "Running the installer" echo "Running the installer"
./Installer ./Installer