Skip to content

Commit

Permalink
Merge pull request Aurorastation#15 from FluffyGhoster/2.1.0+a5
Browse files Browse the repository at this point in the history
2.1.0+a5
  • Loading branch information
Arrow768 authored Nov 21, 2023
2 parents f8e0be2 + b23a04d commit 6fa0fe0
Show file tree
Hide file tree
Showing 24 changed files with 972 additions and 504 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install -y g++-multilib zlib1g-dev:i386 libssl-dev:i386
sudo apt-get install -y libgcc-s1:i386 g++-multilib zlib1g-dev:i386 libssl-dev:i386
./scripts/install_byond.sh
- uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
release_name: ${{ github.ref }}
draft: false
prerelease: false

- uses: actions/download-artifact@v2
with:
name: Windows Build
Expand All @@ -150,8 +150,8 @@ jobs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./i686-pc-windows-msvc/release/rust_g.pdb
asset_name: rust_g.pdb
asset_content_type: application/octet-stream
asset_content_type: application/octet-stream

- uses: actions/download-artifact@v2
with:
name: Linux Build
Expand Down
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"rust-analyzer.cargo.target": "i686-pc-windows-msvc"
"rust-analyzer.cargo.target": "i686-pc-windows-msvc",
"rust-analyzer.linkedProjects": [
".\\Cargo.toml"
]
}
Loading

0 comments on commit 6fa0fe0

Please sign in to comment.