Skip to content

Commit

Permalink
Merge branch 'master' into storage_messages
Browse files Browse the repository at this point in the history
  • Loading branch information
FluffyGhoster committed May 10, 2024
2 parents 72d284d + 4f7738f commit f0fede1
Show file tree
Hide file tree
Showing 1,952 changed files with 669,501 additions and 248,138 deletions.
93 changes: 93 additions & 0 deletions .github/workflows/build_bapi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: Build BAPI
on:
issue_comment:
types: [created]

jobs:
build-bapi:
if: |
github.event.issue.pull_request &&
(github.event.comment.body == '!build_bapi') &&
((github.event.sender.id == github.event.issue.user.id) ||
(github.event.comment.author_association == 'COLLABORATOR') ||
(github.event.comment.author_association == 'MEMBER') ||
(github.event.comment.author_association == 'OWNER'))
runs-on: ubuntu-latest
steps:
- name: Like the comment
env:
BASE_REPOSITORY: ${{ github.repository }}
GH_TOKEN: ${{ github.token }}
run: |
gh api \
--method POST \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
/repos/$BASE_REPOSITORY/issues/comments/${{ github.event.comment.id }}/reactions \
-f content='+1'
- name: PR Data
run: |
pr_json=$(curl -L -s --fail-with-body -H "Authorization: token ${{ github.token }}" ${{ github.event.issue.pull_request.url }})
if [ `jq -r '.maintainer_can_modify' <<<$pr_json` == "false" ] ; then
gh pr comment ${{ github.event.issue.html_url }} --body 'GitHub Actions can not push to the repository without "Allow edits and access to secrets by maintainers" checked.'
echo "FAIL_NOTIFIED=true" >> "$GITHUB_ENV"
exit 1
fi
echo "PR_REPO=`jq -r '.head.repo.full_name' <<<$pr_json`" >> $GITHUB_ENV
echo "PR_BRANCH=`jq -r '.head.ref' <<<$pr_json`" >> $GITHUB_ENV
echo "PR_HEAD_LABEL=`jq -r '.head.label' <<<$pr_json`" >> $GITHUB_ENV
- uses: actions/checkout@v4
with:
repository: ${{ env.PR_REPO }}
ref: ${{ env.PR_BRANCH }}
token: ${{ github.token }}

- name: Build BAPI
env:
BASE_BRANCH: ${{ github.event.repository.default_branch }}
BASE_REPOSITORY: ${{ github.repository }}
GH_TOKEN: ${{ github.token }}
run: |
# Get the code.
git config user.name AuroraBuildBot
git config user.email "[email protected]"
git pull origin "$PR_BRANCH" --depth=$((ahead_by + 1))
git remote add upstream "https://github.com/$BASE_REPOSITORY.git"
git fetch upstream "$BASE_BRANCH" --depth=$((behind_by + 1))
cd rust/bapi
# Get dependencies.
rustup target add i686-unknown-linux-gnu
rustup target add i686-pc-windows-gnu
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install zlib1g-dev:i386 lib32gcc-11-dev mingw-w64 mingw-w64-i686-dev
# Build it.
cargo build --release --target i686-unknown-linux-gnu
cargo build --release --target i686-pc-windows-gnu
# Copy the built targets to their checked-in locations.
cp target/i686-unknown-linux-gnu/release/libbapi.so ../../tools/ci/libbapi_ci.so
cp target/i686-pc-windows-gnu/release/bapi.dll ../../bapi.dll
# Check if a workflow file would be modified by the merge (permissions prevent pushes if so)
latest_workflow_commit=$(git log -n 1 --pretty=format:"%H" upstream/$BASE_BRANCH -- .github/workflows)
if ! git branch --contains $latest_workflow_commit | grep -q "$(git rev-parse --abbrev-ref HEAD)"; then
gh pr comment ${{ github.event.issue.html_url }} --body "GitHub Actions can not push to this branch as workflow files have been changed since your branch was last updated. Please update your branch past https://github.com/$BASE_REPOSITORY/commit/$latest_workflow_commit before using this command again."
echo "FAIL_NOTIFIED=true" >> "$GITHUB_ENV"
exit 1
fi
git commit -a -m "Build BAPI" --allow-empty
git push origin
- name: Notify Failure
if: failure() && env.FAIL_NOTIFIED != 'true'
env:
GH_TOKEN: ${{ github.token }}
run: |
gh pr comment ${{ github.event.issue.html_url }} -b 'Building BAPI failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
15 changes: 10 additions & 5 deletions .github/workflows/byond.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
FLYWAY_BUILD: ""
SPACEMAN_DMM_VERSION: ""
NODE_VERSION: ""
NODE_VERSION_PRECISE: ""
NODE_VERSION_LTS: ""
PYTHON_VERSION: ""

#If we want the runner to open an SSH shell for us to inspect it, fairly nieche, don't touch if you don't know what you're doing
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
# https://megalinter.io/latest/
- name: Check EditorConfig Compliance
id: ml
uses: oxsecurity/megalinter/flavors/python@v7.3.0
uses: oxsecurity/megalinter/flavors/python@v7.10.0
# Env config options outlined in https://megalinter.io/configuration/
env:
PRINT_ALPACA: false
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
uses: actions/setup-node@v3
with:
cache-dependency-path: tgui/yarn.lock
node-version: ${{ env.NODE_VERSION_PRECISE }}
node-version: ${{ env.NODE_VERSION_LTS }}
cache: 'yarn'

#Lint TGUI
Expand Down Expand Up @@ -294,9 +294,14 @@ jobs:
run: |
tools/bootstrap/python -m dmi.test
- name: Check DMM-Test
- name: Run Map Checks
run: |
tools/bootstrap/python -m mapmerge2.dmm_test
tools/bootstrap/python -m tools.maplint.source
- name: Scan DMMs
run: |
tools/bootstrap/python -m dmm_scanner.scan_camera_ctags
###########################################
############## GENERIC TESTS ##############
Expand Down Expand Up @@ -946,7 +951,7 @@ jobs:
strategy:
matrix:
map: [runtime]
pod: [ruins]
pod: [ruins-1, ruins-2, ruins-3]
fail-fast: false

steps:
Expand Down
75 changes: 46 additions & 29 deletions .github/workflows/update_changelog.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,53 @@
name: "Build Changelog"
on:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:
push:
branches:
- master
paths:
- 'html/changelogs/**'

jobs:
update-changelog:
concurrency: changelog
compile:
name: "Compile changelogs"
runs-on: ubuntu-22.04
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
token: ${{ secrets.BOT_TOKEN_AURORA }}

- name: Update Changelogs
run: |
tools/bootstrap/python tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs
- name: Commit Changelogs
run: |
git pull origin master
git config --local user.email "[email protected]"
git config --local user.name "AuroraBuildBot"
git add --force html/*
git commit -m "Automatic Changelog compile [ci skip]" -a || true
- name: Push
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.BOT_TOKEN_AURORA }}
- name: "Check for BOT_TOKEN_AURORA secret and pass true to output if it exists to be checked by later steps"
id: value_holder
env:
ENABLER_SECRET: ${{ secrets.BOT_TOKEN_AURORA }}
run: |
unset SECRET_EXISTS
if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
- name: "Setup python"
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/setup-python@v1
with:
python-version: '3.x'
- name: "Install deps"
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
python -m pip install --upgrade pip
python -m pip install pyyaml
sudo apt-get install dos2unix
- name: "Checkout"
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v4
with:
fetch-depth: 25
persist-credentials: false
- name: "Compile"
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
tools/bootstrap/python tools/GenerateChangelog/ss13_genchangelog.py html/changelogs
- name: Commit
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
git config --local user.email "[email protected]"
git config --local user.name "Changelogs"
git pull origin master
git add html/changelogs
git commit -m "Automatic changelog compile [ci skip]" -a || true
- name: "Push"
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.BOT_TOKEN_AURORA || secrets.GITHUB_TOKEN }}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,6 @@ __pycache__/
.python-version

define_sanity_output.txt
tools/bootstrap/.cache/venv/

# Unit test / coverage reports
.cache
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,8 @@
"editor.rulers": [80],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
}
},
"rust-analyzer.linkedProjects": [
"rust/bapi/Cargo.toml"
]
}
8 changes: 8 additions & 0 deletions SpacemanDMM.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ invalid_lint_directive_value = "error"
invalid_set_value = "error"
unknown_linter_setting = "error"
override_missing_keyword_arg = "error"
must_not_override = "error"
must_call_parent = "error"
final_var = "error"
private_var = "error"
protected_var = "error"
must_be_pure = "error"
must_not_sleep = "error"
redefined_proc = "error"
ambiguous_in_lhs = "error"
ambiguous_not_bitwise = "error"
no_typehint_implicit_new = "error"
Expand Down
Loading

0 comments on commit f0fede1

Please sign in to comment.