Skip to content

Commit

Permalink
Merge branch 'master' into loadout_points
Browse files Browse the repository at this point in the history
  • Loading branch information
msw7007 authored Nov 2, 2024
2 parents 63c3629 + 792f35f commit eb77a67
Show file tree
Hide file tree
Showing 4,767 changed files with 23,186 additions and 7,255 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
52 changes: 52 additions & 0 deletions .github/workflows/discord_discussions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Discord Discussions

on:
pull_request_target:
types:
- opened
- reopened
- edited
- labeled
- closed
branches:
- master

concurrency:
group: "discord-discussions-${{ github.head_ref }}"
cancel-in-progress: true

jobs:
manage-discord-discussion:
name: Manage Discord Discussion
runs-on: ubuntu-latest
if: contains(github.event.pull_request.labels.*.name, 'Discord Discussion')
steps:
- name: Fail if vars.DISCORD_DISCUSSIONS_CHANNEL_ID is unset
if: ${{ vars.DISCORD_DISCUSSIONS_CHANNEL_ID == '' }}
run: |
echo "vars.DISCORD_DISCUSSIONS_CHANNEL_ID (${{ vars.DISCORD_DISCUSSIONS_CHANNEL_ID }}) must be set to use this label!"
exit 1
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-quality: ga

- name: Checkout
uses: actions/checkout@v4

- name: Build Tgstation.DiscordDiscussions
run: dotnet publish -c Release -o discord_discussions_bins tools/Tgstation.DiscordDiscussions/Tgstation.DiscordDiscussions.csproj

- name: Generate App Token
id: app-token-generation
uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}

- name: Run Tgstation.DiscordDiscussions
run: dotnet discord_discussions_bins/Tgstation.DiscordDiscussions.dll ${{ steps.app-token-generation.outputs.token }} ${{ github.repository_owner }} ${{ github.event.repository.name }} ${{ github.event.pull_request.number }} ${{ github.event.pull_request.merged && 'merged' || github.event.pull_request.state }} ${{ secrets.DISCORD_DISCUSSIONS_TOKEN }} ${{ vars.DISCORD_DISCUSSIONS_CHANNEL_ID }} ${{ github.event.action == 'reopened' && 'true' || 'false' }} ${{ vars.DISCORD_JOIN_LINK }}
env:
GITHUB_PULL_REQUEST_TITLE: ${{ github.event.pull_request.title }}
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ Temporary Items
/tools/MapAtmosFixer/MapAtmosFixer/bin/*
/tools/CreditsTool/bin/*
/tools/CreditsTool/obj/*
/tools/Tgstation.DiscordDiscussions/.vs/*
/tools/Tgstation.DiscordDiscussions/bin/*
/tools/Tgstation.DiscordDiscussions/obj/*
/tools/Tgstation.DiscordDiscussions/Properties/launchSettings.json

#GitHub Atom
.atom-build.json
Expand Down Expand Up @@ -244,3 +248,4 @@ define_sanity_output.txt

# Running OpenDream locally
tgstation.json
rust_g64.dll
7 changes: 7 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@
"-trusted"
],
"preLaunchTask": "Build All (low memory mode)"
},
{
"type": "opendream",
"request": "launch",
"name": "Launch OpenDream (requires extension, 64 bit rustg, and an SS14 account)",
"preLaunchTask": "OpenDream: compile ${command:CurrentDME}",
"json_path": "${workspaceFolder}/${command:CurrentJson}"
}
]
}
Loading

0 comments on commit eb77a67

Please sign in to comment.