Skip to content

Commit

Permalink
Merge pull request PentestSS13#32 from Constellado/fix-tests
Browse files Browse the repository at this point in the history
Updates rust-g and fixes all of the various code tests.
  • Loading branch information
Constellado authored Oct 10, 2024
2 parents d788c5e + 519e4d8 commit ec23a5a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
compile_all_maps:
if: ${{ ! contains(github.event.head_commit.message, '[ci skip]') }}
name: Compile Maps
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
type: string
jobs:
run_integration_tests:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
services:
mysql:
image: mysql:latest
Expand Down
4 changes: 2 additions & 2 deletions dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ export BYOND_MAJOR=515
export BYOND_MINOR=1633

#rust version
export RUST_VERSION=1.73.0
export RUST_VERSION=1.81.0

#rust_g git tag
export RUST_G_VERSION=3.0.0
export RUST_G_VERSION=3.3.0

#node version
export NODE_VERSION=16
Expand Down
4 changes: 1 addition & 3 deletions tools/tgs_test/Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Simple app meant to test tgstation's TGS integration given a fresh TGS install with the default account
//
// Args: Repository Owner/Name, TGS instance path, TGS API port, Pushed commit hash (For .tgs.yml access), GitHub Token, (OPTIONAL) PR Number
// Args: Repository Owner/Name, TGS instance path, TGS API port, Pushed commit hash (For .tgs.yml access), GitHub Token, (OPTIONAL) PR Number

using System.Reflection;
using System.Text;
Expand Down Expand Up @@ -197,8 +197,6 @@
{
Origin = new Uri($"http://github.com/{repoSlug}"),
UpdateSubmodules = true,
AccessUser = "Testing",
AccessToken = gitHubToken
},
default);

Expand Down

0 comments on commit ec23a5a

Please sign in to comment.