Skip to content

Commit

Permalink
Merge branch 'master' into Atlas-Explo-Shuttle-tweaks-n'-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
GySgtMurphy authored Dec 20, 2024
2 parents 9f7289c + ee00e4c commit 4062adc
Show file tree
Hide file tree
Showing 165 changed files with 8,540 additions and 5,969 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run_linters:
name: Run Linters
needs: start_gate
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 10

steps:
Expand Down Expand Up @@ -75,6 +75,7 @@ jobs:
bash tools/ci/install_node.sh
bash tools/ci/install/install_spaceman_dmm.sh dreamchecker
bash tools/ci/install_ripgrep.sh
sudo apt install -y python3-pip
tools/bootstrap/python -c ''
- name: Give Linters A Go
id: linter-setup
Expand Down Expand Up @@ -140,19 +141,25 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- uses: actions/checkout@v4
- name: Restore Flyway
uses: actions/cache@v4
with:
path: ~/flyway
key: ${{ runner.os }}-flyway-${{ hashFiles('dependencies.sh') }}
- name: Restore BYOND cache
uses: actions/cache@v4
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }}
- name: Install flyway
run: |
bash tools/ci/install/install_flyway.sh
- name: Setup database
run: |
sudo systemctl start mysql
mysql -u root -proot -e 'CREATE DATABASE ss13_ci;'
mysql -u root -proot ss13_ci < SQL/database_schema_prefixed.sql
mysql -u root -proot ss13_ci < SQL/unified_schema.sql
# mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;'
# mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
mysql -u root -proot -e 'CREATE DATABASE ss13;'
source dependencies.sh
~/flyway/flyway-$FLYWAY_VERSION/flyway -user=root -password=root -url=jdbc:mariadb://localhost:3306/ss13 -locations="filesystem:sql/migrations" migrate
- name: Install rust-g
run: |
bash tools/ci/install/install_rust_g.sh
Expand Down
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"donkie.vscode-tgstation-test-adapter",
"anturk.dmi-editor",
"aaron-bond.better-comments",
"ss13.opendream"
"ss13.opendream",
"tamasfe.even-better-toml"
]
}
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,12 @@ On **May 9, 2022** we have changed the way to compile the codebase.
## SQL Setup

The SQL backend for the library and stats tracking requires a MariaDB server.
Your server details go in /config/legacy/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql.
More detailed setup instructions arecoming soon, for now ask in our Discord.
Your server details go in /config/legacy/dbconfig.txt.

Flyway is used for setup and migration. Run the migrations in `sql/migrations` against your database, and everything should just work.
We do not use table prefixes.

More detailed setup instructions are coming soon, for now ask in our Discord.

todo: update this section

Expand All @@ -62,6 +66,7 @@ These are also the folders you are likely going to encounter while managing the
- /players: player data, like saves and characters get dumped in here
- /tmp: server scratch space
- /assets - for asset generation
- /config - used as scratch space for config

You only need to make the top level folders (e.g. config, data) static folders in TGS4.

Expand Down
Loading

0 comments on commit 4062adc

Please sign in to comment.