Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auxmos update #2483

Merged
merged 160 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
160 commits
Select commit Hold shift + click to select a range
41bbe6d
regexing
MarkSuckerberg Jun 30, 2023
fdd672e
bunch more fixes
MarkSuckerberg Jun 30, 2023
d035a13
more stuff
MarkSuckerberg Jul 1, 2023
dadf48e
more (optional) stuff
MarkSuckerberg Jul 1, 2023
8bcd523
Add support for running tests on alternate versions (#71177)
Mothblocks Nov 9, 2022
9bb930f
thog don't caare
MarkSuckerberg Jul 1, 2023
33e242f
let's try this!
MarkSuckerberg Jul 1, 2023
715f539
oh right lol
MarkSuckerberg Jul 1, 2023
6b099e3
here
MarkSuckerberg Jul 1, 2023
7b49483
debug
MarkSuckerberg Jul 1, 2023
558a4c3
i'm such a silly
MarkSuckerberg Jul 1, 2023
0d294f8
Ensures external libraries can't be called by callbacks (#71346)
Y0SH1M4S73R Nov 22, 2022
e25faaa
Ensures external libraries can't be called by callbacks (#71346)
MarkSuckerberg Jul 1, 2023
9e55171
fcopy 515 linux compat (#75835)
MrStonedOne Jun 5, 2023
e0b3f95
please :pleading_face:
MarkSuckerberg Jul 1, 2023
bdd3c5e
haha 123
MarkSuckerberg Jul 1, 2023
1c6b335
:sob:
MarkSuckerberg Jul 1, 2023
701f587
guh
MarkSuckerberg Jul 1, 2023
98917f6
idk
MarkSuckerberg Jul 1, 2023
a73f5df
don't hate me I just want to see if this works
MarkSuckerberg Jul 1, 2023
4aea38f
:pleading_face: two
MarkSuckerberg Jul 1, 2023
1bda424
WHOOPS
MarkSuckerberg Jul 1, 2023
ac081e5
I JUST WANT TO SEE IF IT WORKS OKAY??
MarkSuckerberg Jul 1, 2023
a4a30d5
sob emoji
MarkSuckerberg Jul 1, 2023
22eaffd
1604
MarkSuckerberg Jul 1, 2023
e130ed0
ah well I give up
MarkSuckerberg Jul 1, 2023
dcd96a7
Merge remote-tracking branch 'upstream/master' into five-fifteen
MarkSuckerberg Jul 6, 2023
41f1d7c
LET'S HAVE A GO AT IT
MarkSuckerberg Jul 20, 2023
4ed93c7
HEEEEEEEEEEEEEEEEELP
MarkSuckerberg Jul 20, 2023
6493e94
HEEEEEEEEEELP MEEEEEEEE
MarkSuckerberg Jul 20, 2023
8dd7b0d
Merge remote-tracking branch 'upstream/master' into five-fifteen
MarkSuckerberg Aug 1, 2023
9e937c3
more updates
MarkSuckerberg Aug 1, 2023
9dd0fdc
let's just fucking try this lmao
MarkSuckerberg Aug 1, 2023
77504a6
more things
MarkSuckerberg Aug 2, 2023
6447df8
oopsie
MarkSuckerberg Aug 2, 2023
6b0e079
REEE
MarkSuckerberg Aug 2, 2023
e437822
eee
MarkSuckerberg Aug 2, 2023
4125c9a
I give up
MarkSuckerberg Aug 2, 2023
6f75ff5
bumps rust-g to latest
MarkSuckerberg Aug 2, 2023
4d3c4c0
this too
MarkSuckerberg Aug 2, 2023
a4e4d2d
whoops
MarkSuckerberg Aug 2, 2023
4d973e5
More fixes
MarkSuckerberg Sep 13, 2023
f7c6a0d
Merge remote-tracking branch 'upstream/master' into five-fifteen
MarkSuckerberg Sep 15, 2023
00ac3b8
Fixes to the merge
MarkSuckerberg Sep 15, 2023
90deb55
let's try this
MarkSuckerberg Sep 15, 2023
322f322
Merge remote-tracking branch 'upstream/master' into five-fifteen
MarkSuckerberg Nov 4, 2023
dde25fe
Update more proc calls to use the macro
MarkSuckerberg Nov 4, 2023
c07efef
One more slipped through
MarkSuckerberg Nov 4, 2023
c8f0ca8
updates us to auxmos 2.2.1
MarkSuckerberg Aug 7, 2023
0df621a
updates to latest auxmos
MarkSuckerberg Nov 4, 2023
6faf427
Disables 515 test
MarkSuckerberg Nov 4, 2023
cfc5213
MORE
MarkSuckerberg Nov 4, 2023
38e1fc8
ough!
MarkSuckerberg Nov 8, 2023
fe0622e
Gets it all working
MarkSuckerberg Nov 14, 2023
b58fdc2
updates dependency info
MarkSuckerberg Nov 14, 2023
24b0d87
Merge remote-tracking branch 'upstream/master' into auxmos-update
MarkSuckerberg Nov 14, 2023
b266175
fixes lints
MarkSuckerberg Nov 14, 2023
ab1f26a
more changes
MarkSuckerberg Nov 14, 2023
3a36eb1
oopsie
MarkSuckerberg Nov 15, 2023
81dbd23
Adds VERB_REF and derivative (#74500)
MarkSuckerberg Nov 15, 2023
d672532
shrug
MarkSuckerberg Nov 29, 2023
aaa5819
Update client click handling for 514 (#77316)
MrStonedOne Aug 2, 2023
9288060
Should fix the rest of the 515 BS
MarkSuckerberg Nov 29, 2023
f8b29de
Merge branch 'master' into auxmos-update
MarkSuckerberg Nov 29, 2023
6ddda5f
oops
MarkSuckerberg Nov 29, 2023
95bf70f
fixes adjacencies not being calculated
MarkSuckerberg Nov 29, 2023
8d04bb1
A few more tweaks
MarkSuckerberg Nov 30, 2023
cf7edc6
Attempt 1
MarkSuckerberg Dec 1, 2023
7094f97
oop
MarkSuckerberg Dec 1, 2023
eb9bf27
come on now
MarkSuckerberg Dec 1, 2023
3049232
Add g++-multilib installation and target for
MarkSuckerberg Dec 1, 2023
91da8ad
so close
MarkSuckerberg Dec 1, 2023
13f00b3
I guess this was on purpose
MarkSuckerberg Dec 1, 2023
8c0b8f0
More things
MarkSuckerberg Dec 1, 2023
acbaf2d
AAAAUGH
MarkSuckerberg Dec 1, 2023
2312dd7
raargh
MarkSuckerberg Dec 1, 2023
06c2a3c
ree
MarkSuckerberg Dec 1, 2023
6a46528
sigh
MarkSuckerberg Dec 1, 2023
75a00f2
whoops
MarkSuckerberg Dec 1, 2023
a6b02bf
goes back to what worked
MarkSuckerberg Dec 1, 2023
8ba42bc
rectifies things
MarkSuckerberg Dec 1, 2023
60ddc86
I'm dumb
MarkSuckerberg Dec 1, 2023
66cd731
we do actually need this after all
MarkSuckerberg Dec 1, 2023
a92a02e
weird
MarkSuckerberg Dec 1, 2023
3b1abbe
whoops
MarkSuckerberg Dec 1, 2023
45ae88e
Updates auxmos
MarkSuckerberg Dec 2, 2023
2de75e4
switches to 1620 on CI
MarkSuckerberg Dec 2, 2023
9c0b98b
copies the .so to the github workspace instead
MarkSuckerberg Dec 2, 2023
c3222ab
updates dll and includes ldd to ensure deps fulfilled
MarkSuckerberg Dec 2, 2023
a066d2b
trying again
MarkSuckerberg Dec 2, 2023
83703a8
let's see if this works
MarkSuckerberg Dec 2, 2023
73c3871
I can't get us any closer to yogs easily
MarkSuckerberg Dec 4, 2023
afc368e
Adds clang to TGS dependencies install script
MarkSuckerberg Dec 5, 2023
9ebc3e6
Pushes new bindings again
MarkSuckerberg Dec 5, 2023
98068c5
Bumps auxmos version
MarkSuckerberg Dec 5, 2023
5a97530
Regenerates bindings
MarkSuckerberg Dec 5, 2023
b567039
downgrades to ubuntu 20.04 for integration tests
MarkSuckerberg Dec 5, 2023
ef30e57
Moves back to latest
MarkSuckerberg Dec 5, 2023
9fc8fb5
Merge remote-tracking branch 'upstream/master' into auxmos-update
MarkSuckerberg Dec 6, 2023
56e78dc
idfk
MarkSuckerberg Dec 6, 2023
7c04354
Updates auxmos, HOPEFULLY for good this time
MarkSuckerberg Dec 6, 2023
b5cac71
Drops all_reaction_hooks
MarkSuckerberg Dec 6, 2023
c24d1d6
downgrades tests to 20.04 again
MarkSuckerberg Dec 6, 2023
1d49e4a
let's try this
MarkSuckerberg Dec 6, 2023
e809ab4
back to latest ubuntu
MarkSuckerberg Dec 6, 2023
12a9fcd
oops, need to get rid of that
MarkSuckerberg Dec 6, 2023
bac2dbb
(o)opps
MarkSuckerberg Dec 7, 2023
80781e8
adds LD_DEBUG envvar to all
MarkSuckerberg Dec 8, 2023
5132783
try it this way
MarkSuckerberg Dec 8, 2023
54c4e6a
FOOL
MarkSuckerberg Dec 8, 2023
92514ea
idfk
MarkSuckerberg Dec 8, 2023
16def5a
ree
MarkSuckerberg Dec 8, 2023
9a0d91b
please
MarkSuckerberg Dec 8, 2023
6756e12
sigh
MarkSuckerberg Dec 8, 2023
f98bff1
we're almost there
MarkSuckerberg Dec 8, 2023
21a06c1
iunno
MarkSuckerberg Dec 8, 2023
edea1bf
graaah
MarkSuckerberg Dec 8, 2023
44d91f1
Makes caching even more worthwhile
MarkSuckerberg Dec 8, 2023
8b9cc29
whoops
MarkSuckerberg Dec 8, 2023
0b1ee25
More stuff
MarkSuckerberg Dec 8, 2023
1d60e8f
more tweaks to get these checks to pass
MarkSuckerberg Dec 8, 2023
b83c38e
please
MarkSuckerberg Dec 8, 2023
39dc09c
fixes the hanging ref
MarkSuckerberg Dec 8, 2023
d5709e4
fixes minor runtime
MarkSuckerberg Dec 8, 2023
39ff2f3
let's try it this way
MarkSuckerberg Dec 9, 2023
200d40c
grrrrr
MarkSuckerberg Dec 9, 2023
23d95b8
optimises ICAT
MarkSuckerberg Dec 11, 2023
fc3a341
Merge branch 'master' into auxmos-update
MarkSuckerberg Dec 13, 2023
5874f93
attempted update
MarkSuckerberg Dec 28, 2023
2d85e92
sees if the thing has been fixed
MarkSuckerberg Dec 28, 2023
ad4740f
Merge branch 'master' into auxmos-update
MarkSuckerberg Dec 30, 2023
7d7ecb2
minor updates
MarkSuckerberg Jan 12, 2024
fb21cb0
Merge branch 'master' into auxmos-update
MarkSuckerberg Jan 15, 2024
baf1158
updates again
MarkSuckerberg Jan 17, 2024
33adeac
welp
MarkSuckerberg Jan 18, 2024
3f85472
Merge branch 'master' into auxmos-update
MarkSuckerberg Feb 10, 2024
ac8f7cc
updates
MarkSuckerberg Mar 1, 2024
29ca12b
readds this
MarkSuckerberg Mar 1, 2024
13d5f2c
downgrades byond
MarkSuckerberg Mar 1, 2024
6e27d2b
updates auxmos and byond
MarkSuckerberg Mar 12, 2024
da3efbe
Merge branch 'master' into auxmos-update
MarkSuckerberg Mar 12, 2024
0bafe77
prevents things from being blown by spacewind before init
MarkSuckerberg Mar 12, 2024
414ccef
makes CI not fail-fast
MarkSuckerberg Mar 12, 2024
8dd7b8e
removes `__auxmos_shutdown()`
MarkSuckerberg Mar 12, 2024
a451a72
trying something
MarkSuckerberg Mar 13, 2024
3447838
kat's changes
MarkSuckerberg Mar 13, 2024
436ba24
Revert "trying something"
MarkSuckerberg Mar 13, 2024
4a68117
Revert "kat's changes"
MarkSuckerberg Mar 13, 2024
3f4c6fd
gwuh
MarkSuckerberg Mar 13, 2024
0fe05ab
fixes optimization error
MarkSuckerberg Mar 13, 2024
11784ab
let's try this again then
MarkSuckerberg Mar 13, 2024
59f40a1
fixes even more
MarkSuckerberg Mar 13, 2024
0846438
trying it without defer this time
MarkSuckerberg Mar 13, 2024
ff7fe34
Clears adjacences before shuttle movement
MarkSuckerberg Mar 13, 2024
a4104bc
oops I slipped and dropped this down the drain
MarkSuckerberg Mar 13, 2024
f090723
oops
MarkSuckerberg Mar 14, 2024
c0f8819
Merge branch 'master' into auxmos-update
MarkSuckerberg Mar 16, 2024
1917c45
Revert "oops I slipped and dropped this down the drain"
MarkSuckerberg Mar 17, 2024
f4d740d
box class change
MarkSuckerberg Mar 17, 2024
c3800e3
skreeeh
MarkSuckerberg Mar 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add support for running tests on alternate versions (#71177)
Adds support for additional byond versions tests
  • Loading branch information
Mothblocks authored and MarkSuckerberg committed Jul 1, 2023
commit 8bcd523cdd321cfe6efb2efb0fe95aaaca3ffa52
9 changes: 9 additions & 0 deletions .github/alternate_byond_versions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This file contains extra tests to run for specific BYOND versions.
# This is useful for making sure we maintain compatibility with both older and newer versions,
# while still having our main tests run on a guaranteed pinned version.

# Format is version
# Example:
# 500.1337

515.1606
65 changes: 20 additions & 45 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- master
jobs:
run_linters:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Run Linters
runs-on: ubuntu-20.04
steps:
Expand Down Expand Up @@ -66,6 +67,7 @@ jobs:
cat check_regex_output.txt

compile_all_maps:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Compile Maps
runs-on: ubuntu-20.04
steps:
Expand All @@ -90,54 +92,27 @@ jobs:
tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS -DFULL_INIT

run_all_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Integration Tests
runs-on: ubuntu-20.04
uses: ./.github/workflows/run_integration_tests.yml
concurrency:
group: run_all_tests-${{ github.ref }}
cancel-in-progress: true

run_alternate_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Alternate Tests
strategy:
fail-fast: false
services:
mysql:
image: mysql:latest
env:
MYSQL_ROOT_PASSWORD: root
ports:
- 3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- uses: actions/checkout@v3
- name: Setup cache
id: cache-byond
uses: actions/cache@v3
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-cache-${{ hashFiles('Dockerfile') }}
- name: Install BYOND
if: steps.cache-byond.outputs.cache-hit != 'true'
run: bash tools/ci/install_byond.sh
- name: Setup database
run: |
sudo systemctl start mysql
mysql -u root -proot -e 'CREATE DATABASE tg_ci;'
mysql -u root -proot tg_ci < SQL/tgstation_schema.sql
mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;'
mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
- name: Install rust-g
run: |
sudo dpkg --add-architecture i386
sudo apt update || true
sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
bash tools/ci/install_rust_g.sh
- name: Install auxmos
run: |
bash tools/ci/install_auxmos.sh
- name: Compile Tests
run: |
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
- name: Run Tests
run: |
source $HOME/BYOND/byond/bin/byondsetup
bash tools/ci/run_server.sh
matrix:
setup: ${{ fromJSON($(jq -nRc '[inputs | capture("^(?<major>[0-9]+)\\.(?<minor>[0-9]+)$")]' .github/alternate_byond_versions.txt)) }}
concurrency:
group: run_all_tests-${{ github.ref }}-${{ matrix.setup.major }}.${{ matrix.setup.minor }}
cancel-in-progress: true
uses: ./.github/workflows/run_integration_tests.yml
with:
major: ${{ matrix.setup.major }}
minor: ${{ matrix.setup.minor }}

test_windows:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
Expand Down
64 changes: 64 additions & 0 deletions .github/workflows/run_integration_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# This is a reusable workflow to run integration tests.
# This is run for every single map in ci_suite.yml. You might want to edit that instead.
name: Run Integration Tests
on:
workflow_call:
inputs:
major:
required: false
type: string
minor:
required: false
type: string
jobs:
run_integration_tests:
runs-on: ubuntu-20.04
services:
mysql:
image: mysql:latest
env:
MYSQL_ROOT_PASSWORD: root
ports:
- 3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- uses: actions/checkout@v3
- name: Setup cache
id: cache-byond
uses: actions/cache@v3
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-cache-${{ hashFiles('Dockerfile') }}
- name: Install BYOND
if: steps.cache-byond.outputs.cache-hit != 'true'
run: bash tools/ci/install_byond.sh
- name: Setup database
run: |
sudo systemctl start mysql
mysql -u root -proot -e 'CREATE DATABASE tg_ci;'
mysql -u root -proot tg_ci < SQL/tgstation_schema.sql
mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;'
mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
- name: Install rust-g
run: |
sudo dpkg --add-architecture i386
sudo apt update || true
sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
bash tools/ci/install_rust_g.sh
- name: Install auxmos
run: |
bash tools/ci/install_auxmos.sh
- name: Configure version
run: |
echo "BYOND_MAJOR=${{ inputs.major }}" >> $GITHUB_ENV
echo "BYOND_MINOR=${{ inputs.minor }}" >> $GITHUB_ENV
if: ${{ inputs.major }}
- name: Compile Tests
run: |
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
- name: Run Tests
run: |
source $HOME/BYOND/byond/bin/byondsetup
bash tools/ci/run_server.sh
5 changes: 4 additions & 1 deletion tools/ci/install_byond.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#!/bin/bash
set -euo pipefail

source dependencies.sh
# BYOND_MAJOR and BYOND_MINOR can be explicitly set, such as in alt_byond_versions.txt
if [ -z "${BYOND_MAJOR+x}" ]; then
source dependencies.sh
fi

if [ -d "$HOME/BYOND/byond/bin" ] && grep -Fxq "${BYOND_MAJOR}.${BYOND_MINOR}" $HOME/BYOND/version.txt;
then
Expand Down