Skip to content

Commit eecaae7

Browse files
committed
Squashed commit of the following:
commit 4aff57f Author: vvvv-vvvv <[email protected]> Date: Sun Dec 24 00:39:30 2023 +0000 pathfinder: stringify args expecting numbers (tgstation#163) commit c3313a1 Author: vvvv-vvvv <[email protected]> Date: Sun Dec 24 00:31:03 2023 +0000 pathfinder: fix typo in rustg_remove_node_astar (tgstation#162) commit 79f04b1 Author: ZeWaka <[email protected]> Date: Sat Dec 23 13:15:10 2023 -0800 v3.1.0 (tgstation#161) commit bf20ba0 Author: ZeWaka <[email protected]> Date: Sat Dec 23 01:04:28 2023 -0800 Last little bit of updates (tgstation#159) commit 50f36fa Author: Kapu1178 <[email protected]> Date: Sat Dec 23 03:17:11 2023 -0500 Updates `rustg_file_exists()` macro to remove user error (tgstation#158) commit 75a6384 Author: ZeWaka <[email protected]> Date: Sat Dec 16 18:57:46 2023 -0800 More routine updates (tgstation#157) commit 9cfa350 Author: AffectedArc07 <[email protected]> Date: Sun Dec 17 02:55:52 2023 +0000 Adds Base64 decoding stuff (tgstation#154) commit b964c87 Author: Lucy <[email protected]> Date: Sat Dec 16 20:47:38 2023 -0500 Use gitoxide rather than libgit2 for the git module (tgstation#156) commit 85631fa Author: ZeWaka <[email protected]> Date: Mon Sep 25 13:38:15 2023 -0700 Some routine updates for 3.0.0 (tgstation#152) routine package maintenance and upgrades - i went through the breaking changes and didn't see anything that looked like it affected us, only additions to public apis really commit cd741e9 Author: ZeWaka <[email protected]> Date: Sat Jul 22 17:48:26 2023 -0700 3.0.0 (tgstation#147) commit 36e6613 Author: oranges <[email protected]> Date: Sun Jul 23 11:24:42 2023 +1200 Make mysql use the native rust tls stack by default (tgstation#144)
1 parent 6fa0fe0 commit eecaae7

File tree

13 files changed

+1361
-638
lines changed

13 files changed

+1361
-638
lines changed

.github/workflows/rust.yml

Lines changed: 15 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,30 @@ on:
33
push:
44
branches:
55
- master
6-
tags:
7-
- 'v*'
86
pull_request:
97
branches:
108
- master
119
jobs:
1210
build-windows:
1311
runs-on: windows-latest
1412
steps:
15-
- uses: actions/checkout@v1
13+
- uses: actions/checkout@v4
1614

17-
- uses: actions-rs/toolchain@v1
15+
- uses: dtolnay/rust-toolchain@stable
1816
with:
19-
toolchain: stable
20-
target: i686-pc-windows-msvc
17+
targets: i686-pc-windows-msvc
2118
components: rustfmt, clippy
2219

2320
- uses: Swatinem/rust-cache@v2
2421

2522
- name: Clippy (all features)
26-
uses: actions-rs/cargo@v1
27-
with:
28-
toolchain: stable
29-
command: clippy
30-
args: --target i686-pc-windows-msvc --all-features --locked
23+
run: cargo clippy --target i686-pc-windows-msvc --features all --locked -- -D warnings
3124

3225
- name: Rustfmt
33-
uses: actions-rs/cargo@v1
34-
with:
35-
toolchain: stable
36-
command: fmt
37-
args: -- --check
26+
run: cargo fmt -- --check
3827

3928
- name: Build (release) (default features)
40-
uses: actions-rs/cargo@v1
41-
with:
42-
toolchain: stable
43-
command: build
44-
args: --target i686-pc-windows-msvc --release
29+
run: cargo build --target i686-pc-windows-msvc --locked --release
4530

4631
- uses: actions/upload-artifact@v3
4732
with:
@@ -51,7 +36,6 @@ jobs:
5136
target/i686-pc-windows-msvc/release/rust_g.pdb
5237
target/rust_g.dm
5338
54-
5539
build-linux:
5640
runs-on: ubuntu-latest
5741
env:
@@ -60,49 +44,33 @@ jobs:
6044
PKG_CONFIG_ALLOW_CROSS: 1
6145

6246
steps:
63-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v4
48+
6449
- run: |
6550
sudo dpkg --add-architecture i386
6651
sudo apt-get update
67-
sudo apt-get install -y libgcc-s1:i386 g++-multilib zlib1g-dev:i386 libssl-dev:i386
52+
sudo apt-get install libgcc-s1:i386 g++-multilib zlib1g-dev:i386
6853
./scripts/install_byond.sh
6954
70-
- uses: actions-rs/toolchain@v1
55+
- uses: dtolnay/rust-toolchain@stable
7156
with:
72-
toolchain: stable
73-
target: i686-unknown-linux-gnu
57+
targets: i686-unknown-linux-gnu
7458

7559
- uses: Swatinem/rust-cache@v2
7660

7761
- name: Check (all features)
78-
uses: actions-rs/cargo@v1
79-
with:
80-
toolchain: stable
81-
command: check
82-
args: --target i686-unknown-linux-gnu --all-features
62+
run: cargo check --target i686-unknown-linux-gnu --locked --features all
8363

8464
- name: Build (Debug) (all features)
85-
uses: actions-rs/cargo@v1
86-
with:
87-
toolchain: stable
88-
command: build
89-
args: --target i686-unknown-linux-gnu --all-features
65+
run: cargo build --target i686-unknown-linux-gnu --locked --features all
9066

9167
- name: Run tests (all features)
92-
uses: actions-rs/cargo@v1
93-
with:
94-
toolchain: stable
95-
command: test
96-
args: --target i686-unknown-linux-gnu --all-features
68+
run: cargo test --target i686-unknown-linux-gnu --locked --features all
9769
env:
9870
BYOND_BIN: /home/runner/BYOND/byond/bin
9971

10072
- name: Build (release) (default features)
101-
uses: actions-rs/cargo@v1
102-
with:
103-
toolchain: stable
104-
command: build
105-
args: --target i686-unknown-linux-gnu --release
73+
run: cargo build --target i686-unknown-linux-gnu --locked --release
10674

10775
- uses: actions/upload-artifact@v3
10876
with:

0 commit comments

Comments
 (0)