Skip to content

Commit

Permalink
Merge branch 'master' into things
Browse files Browse the repository at this point in the history
  • Loading branch information
BL02DL authored Dec 22, 2024
2 parents 85811ba + 9c09d57 commit fd2831f
Show file tree
Hide file tree
Showing 9 changed files with 4,037 additions and 3,866 deletions.
34 changes: 15 additions & 19 deletions .github/workflows/publish-lostparadise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v3.6.0
with:
submodules: 'recursive'

Expand All @@ -24,8 +24,13 @@ jobs:
mv Secrets/_PrivateServer Content.Server/_PrivateServer
mv Secrets/_PrivateClient Content.Client/_PrivateClient
- name: Install dependencies
run: sudo apt-get install -y python3-paramiko python3-lxml

- name: Setup .NET Core
uses: actions/[email protected]
uses: actions/[email protected]
with:
dotnet-version: 8.0.100

- name: Get Engine Tag
run: |
Expand All @@ -39,29 +44,20 @@ jobs:
run: dotnet build Content.Packaging --configuration Release --no-restore /m

- name: Package server
run: dotnet run --project Content.Packaging server --platform linux-x64 --platform win-x64
run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64

- name: Package client
run: dotnet run --project Content.Packaging client --no-wipe-release

- name: Upload build artifact
id: artifact-upload-step
uses: actions/upload-artifact@v4
with:
name: build
path: release/*.zip
compression-level: 0
retention-days: 0

- name: Publish version
run: Tools/publish_github_artifact.py
run: Tools/publish_multi_request.py
env:
BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}

- uses: geekyeggo/delete-artifact@v5
if: always()
with:
name: build
- name: Publish changelog
run: Tools/actions_changelogs_since_last_run.py
env:
CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
CHANGELOG_WEBHOOK: ${{ secrets.CHANGELOG_WEBHOOK }}
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
### Основные решения проблем

Попробуйте удалить папку bin и внутренности robusttoolbox.
Попробуйте удалить папку bin и внутренности RobustToolBox.

# Лицензия
Пожалуйста прочитайте файл [LEGAL.md](./LEGAL.md) для получения информации о лицензиях на все ресурсы в этом репозитории.
12 changes: 12 additions & 0 deletions Resources/Changelog/ChangelogLPP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2895,3 +2895,15 @@
id: 153
time: '2024-12-21T11:10:29.0000000+00:00'
url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/349
- author: JayJacobs
changes:
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0410\u0439\u0441\u0411\
\u043E\u043A\u0441 \u0432 \u043F\u0443\u043B\u043B \u043A\u0430\u0440\u0442."
type: Add
- message: "\u0423\u0431\u0440\u0430\u043D\u0430 \u043A\u0440\u0438\u043C.\u043A\
\u043E\u043D\u0441\u043E\u043B\u044C \u0438\u0437 \u043C\u0438\u0433\u0440\u0430\
\u0446\u0438\u0439."
type: Remove
id: 154
time: '2024-12-21T14:26:43.0000000+00:00'
url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/350
Loading

0 comments on commit fd2831f

Please sign in to comment.