diff --git a/.github/workflows/auto-cl-update-atd.yml b/.github/workflows/auto-cl-update-atd.yml new file mode 100644 index 0000000000..22b330c4b8 --- /dev/null +++ b/.github/workflows/auto-cl-update-atd.yml @@ -0,0 +1,69 @@ +name: Auto CL update + +on: + push: + branches: + - master + +permissions: + contents: write + pull-requests: write + +jobs: + post_merge_job: + name: Auto CL update + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3.6.0 + + - name: Pull latest changes for update-changelog branch + run: | + git fetch origin + git checkout -b update-changelog || git checkout update-changelog + + - name: Setup Python + uses: actions/setup-python@v3 + with: + python-version: '3.x' + + - name: Install requirements + run: pip install requests pyyaml + + - name: Run post-merge script + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: python Tools/ATD/auto_cl.py "${{ env.GITHUB_TOKEN }}" "${{ github.repository }}" + + - name: Configure Git + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + + - name: Commit changes + id: commit-changes + run: | + git add . + git diff-index --quiet HEAD || git commit -m "Auto cl update" + continue-on-error: true + + - name: Push changes to a new branch + if: steps.commit-changes.outcome == 'success' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} update-changelog --force + + - name: Create Pull Request + if: steps.commit-changes.outcome == 'success' + uses: peter-evans/create-pull-request@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + base: master + branch: update-changelog + commit-message: "Auto cl update" + title: "Auto CL update" + body: "No cl, no fun" + labels: "auto-update changelog" + continue-on-error: true diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml index 5e72630e4a..6cc86067fa 100644 --- a/.github/workflows/labeler-pr.yml +++ b/.github/workflows/labeler-pr.yml @@ -12,3 +12,5 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/labeler@v5 + with: + sync-labels: true diff --git a/.github/workflows/labeler-untriaged.yml b/.github/workflows/labeler-untriaged.yml index 630122aa08..775aab2654 100644 --- a/.github/workflows/labeler-untriaged.yml +++ b/.github/workflows/labeler-untriaged.yml @@ -9,5 +9,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions-ecosystem/action-add-labels@v1 + if: join(github.event.issue.labels) == '' with: labels: "Status: Untriaged" diff --git a/.github/workflows/update-wiki.yml b/.github/workflows/update-wiki.yml index 2cd13b0d2d..c93069089d 100644 --- a/.github/workflows/update-wiki.yml +++ b/.github/workflows/update-wiki.yml @@ -1,92 +1,92 @@ -name: Update Wiki +# name: Update Wiki -on: - workflow_dispatch: - push: - branches: [ master, jsondump ] - paths: - - '.github/workflows/update-wiki.yml' - - 'Content.Shared/Chemistry/**.cs' - - 'Content.Server/Chemistry/**.cs' - - 'Content.Server/GuideGenerator/**.cs' - - 'Content.Server/Corvax/GuideGenerator/**.cs' - - 'Resources/Prototypes/Reagents/**.yml' - - 'Resources/Prototypes/Chemistry/**.yml' - - 'Resources/Prototypes/Recipes/Reactions/**.yml' - - 'RobustToolbox/' +# on: +# workflow_dispatch: +# push: +# branches: [ master, jsondump ] +# paths: +# - '.github/workflows/update-wiki.yml' +# - 'Content.Shared/Chemistry/**.cs' +# - 'Content.Server/Chemistry/**.cs' +# - 'Content.Server/GuideGenerator/**.cs' +# - 'Content.Server/Corvax/GuideGenerator/**.cs' +# - 'Resources/Prototypes/Reagents/**.yml' +# - 'Resources/Prototypes/Chemistry/**.yml' +# - 'Resources/Prototypes/Recipes/Reactions/**.yml' +# - 'RobustToolbox/' -jobs: - update-wiki: - name: Build and Publish JSON blobs to wiki - runs-on: ubuntu-latest +# jobs: +# update-wiki: +# name: Build and Publish JSON blobs to wiki +# runs-on: ubuntu-latest - steps: - - name: Checkout Master - uses: actions/checkout@v3.6.0 +# steps: +# - name: Checkout Master +# uses: actions/checkout@v3.6.0 - - name: Setup Submodule - run: | - git submodule update --init --recursive +# - name: Setup Submodule +# run: | +# git submodule update --init --recursive - - name: Pull Engine Updates - uses: space-wizards/submodule-dependency@v0.1.5 +# - name: Pull Engine Updates +# uses: space-wizards/submodule-dependency@v0.1.5 - - name: Update Engine Submodules - run: | - cd RobustToolbox/ - git submodule update --init --recursive +# - name: Update Engine Submodules +# run: | +# cd RobustToolbox/ +# git submodule update --init --recursive - - name: Setup .NET Core - uses: actions/setup-dotnet@v3.2.0 - with: - dotnet-version: 7.0.x +# - name: Setup .NET Core +# uses: actions/setup-dotnet@v3.2.0 +# with: +# dotnet-version: 7.0.x - - name: Install Dependencies - run: dotnet restore +# - name: Install Dependencies +# run: dotnet restore - - name: Build Project - run: dotnet build --configuration Release --no-restore /p:WarningsAsErrors=nullable /m +# - name: Build Project +# run: dotnet build --configuration Release --no-restore /p:WarningsAsErrors=nullable /m - - name: Generate JSON blobs for prototypes - run: dotnet ./bin/Content.Server/Content.Server.dll --cvar autogen.destination_file=prototypes.json - continue-on-error: true +# - name: Generate JSON blobs for prototypes +# run: dotnet ./bin/Content.Server/Content.Server.dll --cvar autogen.destination_file=prototypes.json +# continue-on-error: true - - name: Upload chem_prototypes.json to wiki - uses: jtmullen/mediawiki-edit-action@v0.1.1 - with: - wiki_text_file: ./bin/Content.Server/data/chem_prototypes.json - edit_summary: Update chem_prototypes.json via GitHub Actions - page_name: "${{ secrets.WIKI_PAGE_ROOT }}/chem_prototypes.json" - api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php - username: ${{ secrets.WIKI_BOT_USER }} - password: ${{ secrets.WIKI_BOT_PASS }} +# - name: Upload chem_prototypes.json to wiki +# uses: jtmullen/mediawiki-edit-action@v0.1.1 +# with: +# wiki_text_file: ./bin/Content.Server/data/chem_prototypes.json +# edit_summary: Update chem_prototypes.json via GitHub Actions +# page_name: "${{ secrets.WIKI_PAGE_ROOT }}/chem_prototypes.json" +# api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php +# username: ${{ secrets.WIKI_BOT_USER }} +# password: ${{ secrets.WIKI_BOT_PASS }} - - name: Upload react_prototypes.json to wiki - uses: jtmullen/mediawiki-edit-action@v0.1.1 - with: - wiki_text_file: ./bin/Content.Server/data/react_prototypes.json - edit_summary: Update react_prototypes.json via GitHub Actions - page_name: "${{ secrets.WIKI_PAGE_ROOT }}/react_prototypes.json" - api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php - username: ${{ secrets.WIKI_BOT_USER }} - password: ${{ secrets.WIKI_BOT_PASS }} +# - name: Upload react_prototypes.json to wiki +# uses: jtmullen/mediawiki-edit-action@v0.1.1 +# with: +# wiki_text_file: ./bin/Content.Server/data/react_prototypes.json +# edit_summary: Update react_prototypes.json via GitHub Actions +# page_name: "${{ secrets.WIKI_PAGE_ROOT }}/react_prototypes.json" +# api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php +# username: ${{ secrets.WIKI_BOT_USER }} +# password: ${{ secrets.WIKI_BOT_PASS }} - - name: Upload entity_prototypes.json to wiki - uses: jtmullen/mediawiki-edit-action@v0.1.1 - with: - wiki_text_file: ./bin/Content.Server/data/entity_prototypes.json - edit_summary: Update entity_prototypes.json via GitHub Actions - page_name: "${{ secrets.WIKI_PAGE_ROOT }}/entity_prototypes.json" - api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php - username: ${{ secrets.WIKI_BOT_USER }} - password: ${{ secrets.WIKI_BOT_PASS }} +# - name: Upload entity_prototypes.json to wiki +# uses: jtmullen/mediawiki-edit-action@v0.1.1 +# with: +# wiki_text_file: ./bin/Content.Server/data/entity_prototypes.json +# edit_summary: Update entity_prototypes.json via GitHub Actions +# page_name: "${{ secrets.WIKI_PAGE_ROOT }}/entity_prototypes.json" +# api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php +# username: ${{ secrets.WIKI_BOT_USER }} +# password: ${{ secrets.WIKI_BOT_PASS }} - - name: Upload mealrecipes_prototypes.json to wiki - uses: jtmullen/mediawiki-edit-action@v0.1.1 - with: - wiki_text_file: ./bin/Content.Server/data/mealrecipes_prototypes.json - edit_summary: Update mealrecipes_prototypes.json via GitHub Actions - page_name: "${{ secrets.WIKI_PAGE_ROOT }}/mealrecipes_prototypes.json" - api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php - username: ${{ secrets.WIKI_BOT_USER }} - password: ${{ secrets.WIKI_BOT_PASS }} +# - name: Upload mealrecipes_prototypes.json to wiki +# uses: jtmullen/mediawiki-edit-action@v0.1.1 +# with: +# wiki_text_file: ./bin/Content.Server/data/mealrecipes_prototypes.json +# edit_summary: Update mealrecipes_prototypes.json via GitHub Actions +# page_name: "${{ secrets.WIKI_PAGE_ROOT }}/mealrecipes_prototypes.json" +# api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php +# username: ${{ secrets.WIKI_BOT_USER }} +# password: ${{ secrets.WIKI_BOT_PASS }} diff --git a/.gitmodules b/.gitmodules index 5ba1735ee8..bda7de5d83 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,8 +2,3 @@ path = RobustToolbox url = https://github.com/space-wizards/RobustToolbox.git branch = master -[submodule "Secrets"] - path = Secrets - url = git@github.com:corvax-project/secrets.git - branch = master - update = none diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml index 5d630425ab..ef679e778d 100644 --- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml +++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml @@ -5,7 +5,7 @@ + PlaceHolder="{Loc player-list-filter}"/> diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml index dcc1a05bb5..3df57de57b 100644 --- a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml +++ b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml @@ -4,7 +4,7 @@ Title="{Loc admin-player-actions-window-title}" MinSize="425 272"> - diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml index 8f27b17d2d..cceb21f14d 100644 --- a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml +++ b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml @@ -1,9 +1,9 @@  + Title="{Loc admin-ui-teleport}" MinSize="425 230"> - + diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml index 4a1719cbf8..a7c4c35494 100644 --- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml +++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml @@ -1,11 +1,11 @@  + xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-add}"> - -