Skip to content

Commit ec23a5a

Browse files
authored
Merge pull request PentestSS13#32 from Constellado/fix-tests
Updates rust-g and fixes all of the various code tests.
2 parents d788c5e + 519e4d8 commit ec23a5a

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

.github/workflows/ci_suite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
compile_all_maps:
8787
if: ${{ ! contains(github.event.head_commit.message, '[ci skip]') }}
8888
name: Compile Maps
89-
runs-on: ubuntu-latest
89+
runs-on: ubuntu-24.04
9090
steps:
9191
- uses: actions/checkout@v3
9292

.github/workflows/run_integration_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
type: string
1717
jobs:
1818
run_integration_tests:
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-24.04
2020
services:
2121
mysql:
2222
image: mysql:latest

dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ export BYOND_MAJOR=515
88
export BYOND_MINOR=1633
99

1010
#rust version
11-
export RUST_VERSION=1.73.0
11+
export RUST_VERSION=1.81.0
1212

1313
#rust_g git tag
14-
export RUST_G_VERSION=3.0.0
14+
export RUST_G_VERSION=3.3.0
1515

1616
#node version
1717
export NODE_VERSION=16

tools/tgs_test/Program.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Simple app meant to test tgstation's TGS integration given a fresh TGS install with the default account
22
//
3-
// Args: Repository Owner/Name, TGS instance path, TGS API port, Pushed commit hash (For .tgs.yml access), GitHub Token, (OPTIONAL) PR Number
3+
// Args: Repository Owner/Name, TGS instance path, TGS API port, Pushed commit hash (For .tgs.yml access), GitHub Token, (OPTIONAL) PR Number
44

55
using System.Reflection;
66
using System.Text;
@@ -197,8 +197,6 @@
197197
{
198198
Origin = new Uri($"http://github.com/{repoSlug}"),
199199
UpdateSubmodules = true,
200-
AccessUser = "Testing",
201-
AccessToken = gitHubToken
202200
},
203201
default);
204202

0 commit comments

Comments
 (0)