Skip to content

Commit 6fa0fe0

Browse files
authored
Merge pull request Aurorastation#15 from FluffyGhoster/2.1.0+a5
2.1.0+a5
2 parents f8e0be2 + b23a04d commit 6fa0fe0

24 files changed

+972
-504
lines changed

.github/workflows/rust.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- run: |
6565
sudo dpkg --add-architecture i386
6666
sudo apt-get update
67-
sudo apt-get install -y g++-multilib zlib1g-dev:i386 libssl-dev:i386
67+
sudo apt-get install -y libgcc-s1:i386 g++-multilib zlib1g-dev:i386 libssl-dev:i386
6868
./scripts/install_byond.sh
6969
7070
- uses: actions-rs/toolchain@v1
@@ -129,7 +129,7 @@ jobs:
129129
release_name: ${{ github.ref }}
130130
draft: false
131131
prerelease: false
132-
132+
133133
- uses: actions/download-artifact@v2
134134
with:
135135
name: Windows Build
@@ -150,8 +150,8 @@ jobs:
150150
upload_url: ${{ steps.create_release.outputs.upload_url }}
151151
asset_path: ./i686-pc-windows-msvc/release/rust_g.pdb
152152
asset_name: rust_g.pdb
153-
asset_content_type: application/octet-stream
154-
153+
asset_content_type: application/octet-stream
154+
155155
- uses: actions/download-artifact@v2
156156
with:
157157
name: Linux Build

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"rust-analyzer.cargo.target": "i686-pc-windows-msvc"
2+
"rust-analyzer.cargo.target": "i686-pc-windows-msvc",
3+
"rust-analyzer.linkedProjects": [
4+
".\\Cargo.toml"
5+
]
36
}

0 commit comments

Comments
 (0)