Skip to content

Commit

Permalink
??????????
Browse files Browse the repository at this point in the history
  • Loading branch information
Furrior committed Apr 2, 2024
1 parent 7820f93 commit 35f4844
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/run_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
- name: Setup database
run: |
sudo systemctl start mysql
mysql -u root -proot -e 'CREATE DATABASE ci_db;'
mysql -u root -proot ci_db < sql/schema.sql
mysql -u root -proot -e 'CREATE DATABASE test;'
mysql -u root -proot test < sql/schema.sql
- name: Install rust-g
run: |
bash tools/ci/install_rust_g.sh
Expand Down
6 changes: 3 additions & 3 deletions config/example/dbconfig.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ ADDRESS localhost
PORT 3306

# Database the population, death, karma, etc. tables may be found in
DATABASE tgstation
DATABASE test

# Username/Login used to access the database
LOGIN mylogin
LOGIN root

# Password used to access the database
PASSWORD mypassword
PASSWORD root

# The following information is for feedback tracking via the blackbox server
FEEDBACK_DATABASE test
Expand Down
10 changes: 0 additions & 10 deletions tools/ci/ci_config.txt

This file was deleted.

3 changes: 0 additions & 3 deletions tools/ci/run_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ echo Testing $MAP

tools/deploy.sh ci_test

#test config
cp tools/ci/ci_config.txt ci_test/config/config.txt

#set the map
cp maps/$MAP.json ci_test/data/next_map.json

Expand Down
1 change: 1 addition & 0 deletions tools/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ fi

cp baystation12.dmb baystation12.rsc $1/
cp -r config/* $1/config/
cp -r config/example/* $1/config/
cp -r maps/* $1/maps/
cp -r icons/* $1/icons/
cp -r tgui/public/* $1/tgui/public/
Expand Down

0 comments on commit 35f4844

Please sign in to comment.