Skip to content

Commit

Permalink
Merge pull request #1099 from kreghek/master
Browse files Browse the repository at this point in the history
Release 2.3.17
  • Loading branch information
kreghek committed May 20, 2021
2 parents 7b3c1cd + 8ba8f65 commit c03cc8e
Show file tree
Hide file tree
Showing 1,508 changed files with 32,171 additions and 23,180 deletions.
Binary file removed .circleci/Unity_v2018.x.ulf-cipher
Binary file not shown.
238 changes: 0 additions & 238 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,176 +120,6 @@ jobs:
- run: dotnet test Zilon.Core/Zilon.Core.Specs/Zilon.Core.Specs.csproj -c Release
- store_test_results:
path: TestResult.xml
build_Win_x64:
docker:
- image: gableroux/unity3d:2019.2.5f1-windows
steps:
- checkout
- run: mkdir -p /root/.cache/unity3d
- run: mkdir -p /root/.local/share/unity3d/Unity/
- run: openssl aes-256-cbc -d -in .circleci/Unity_v2019.x.ulf-cipher -k ${CIPHER_KEY} >> /root/.local/share/unity3d/Unity/Unity_lic.ulf
- attach_workspace:
at: /core-builds/bin
- run: mkdir -p ./Zilon.Client/Assets/Plugins/ && cp -a /core-builds/bin/. ./Zilon.Client/Assets/Plugins/
- run:
command: |
apt update && apt install -y git
git clone https://github.com/kreghek/Zilon_Roguelike_Plugins.git temp
- run: cp -a temp/. ./Zilon.Client/Assets/Plugins/
- run:
name: Build
command: chmod +x .circleci/buildWindows64.sh && .circleci/buildWindows64.sh
- run:
name: Zipping build
command: apt update && apt -y install zip && zip -r /root/LAST_Win64.zip ./Zilon.Client/Builds/*
- store_artifacts:
path: /root/LAST_Win64.zip
build_Win_x32:
docker:
- image: gableroux/unity3d:2019.2.5f1-windows
steps:
- checkout
- run: mkdir -p /root/.cache/unity3d
- run: mkdir -p /root/.local/share/unity3d/Unity/
- run: openssl aes-256-cbc -d -in .circleci/Unity_v2019.x.ulf-cipher -k ${CIPHER_KEY} >> /root/.local/share/unity3d/Unity/Unity_lic.ulf
- attach_workspace:
at: /core-builds/bin
- run: mkdir -p ./Zilon.Client/Assets/Plugins/ && cp -a /core-builds/bin/. ./Zilon.Client/Assets/Plugins/
- run:
command: |
apt update && apt install -y git
git clone https://github.com/kreghek/Zilon_Roguelike_Plugins.git temp
- run: cp -a temp/. ./Zilon.Client/Assets/Plugins/
- run:
name: Build
command: chmod +x .circleci/buildWindows32.sh && .circleci/buildWindows32.sh
- run:
name: Zipping build
command: apt update && apt -y install zip && zip -r /root/LAST_Win32.zip ./Zilon.Client/Builds/*
- store_artifacts:
path: /root/LAST_Win32.zip
build_Linux_x64:
docker:
- image: gableroux/unity3d:2019.2.5f1-windows
steps:
- checkout
- run: mkdir -p /root/.cache/unity3d
- run: mkdir -p /root/.local/share/unity3d/Unity/
- run: openssl aes-256-cbc -d -in .circleci/Unity_v2019.x.ulf-cipher -k ${CIPHER_KEY} >> /root/.local/share/unity3d/Unity/Unity_lic.ulf
- attach_workspace:
at: /core-builds/bin
- run: mkdir -p ./Zilon.Client/Assets/Plugins/ && cp -a /core-builds/bin/. ./Zilon.Client/Assets/Plugins/
- run:
command: |
apt update && apt install -y git
git clone https://github.com/kreghek/Zilon_Roguelike_Plugins.git temp
- run: cp -a temp/. ./Zilon.Client/Assets/Plugins/
- run:
name: Build
command: chmod +x .circleci/buildLinux64.sh && .circleci/buildLinux64.sh
- run:
name: Zipping build
command: apt update && apt -y install zip && zip -r /root/LAST_Linux64.zip ./Zilon.Client/Builds/*
- store_artifacts:
path: /root/LAST_Linux64.zip
# Только для этого билда на выходе получается пустая папка.
# Поэтому он временно отключен.
build_Linux_x32:
docker:
- image: gableroux/unity3d:2019.2.5f1-windows
steps:
- checkout
- run: mkdir -p /root/.cache/unity3d
- run: mkdir -p /root/.local/share/unity3d/Unity/
- run: openssl aes-256-cbc -d -in .circleci/Unity_v2019.x.ulf-cipher -k ${CIPHER_KEY} >> /root/.local/share/unity3d/Unity/Unity_lic.ulf
- attach_workspace:
at: /core-builds/bin
- run: mkdir -p ./Zilon.Client/Assets/Plugins/ && cp -a /core-builds/bin/. ./Zilon.Client/Assets/Plugins/
- run:
command: |
apt update && apt install -y git
git clone https://github.com/kreghek/Zilon_Roguelike_Plugins.git temp
- run: cp -a temp/. ./Zilon.Client/Assets/Plugins/
- run:
name: Build
command: chmod +x .circleci/buildLinux32.sh && .circleci/buildLinux32.sh
- run:
name: Zipping build
command: apt update && apt -y install zip && zip -r /root/LAST_Linux32.zip ./Zilon.Client/Builds/*
- store_artifacts:
path: /root/LAST_Linux32.zip
build_MacOS_x64:
docker:
- image: gableroux/unity3d:2019.2.5f1-mac
steps:
- checkout
- run: mkdir -p /root/.cache/unity3d
- run: mkdir -p /root/.local/share/unity3d/Unity/
- run: openssl aes-256-cbc -d -in .circleci/Unity_v2019-mac.x.ulf-cipher -k ${CIPHER_KEY_MAC} >> /root/.local/share/unity3d/Unity/Unity_lic.ulf
- attach_workspace:
at: /core-builds/bin
- run: mkdir -p ./Zilon.Client/Assets/Plugins/ && cp -a /core-builds/bin/. ./Zilon.Client/Assets/Plugins/
- run:
command: |
apt update && apt install -y git
git clone https://github.com/kreghek/Zilon_Roguelike_Plugins.git temp
- run: cp -a temp/. ./Zilon.Client/Assets/Plugins/
- run:
name: Build
command: chmod +x .circleci/buildMacOsx64.sh && .circleci/buildMacOsx64.sh
- run:
name: Zipping build
command: apt update && apt -y install zip && zip -r /root/LAST_MacOsx64.zip ./Zilon.Client/Builds/*
- store_artifacts:
path: /root/LAST_MacOsx64.zip
build_MacOS_x32:
docker:
- image: gableroux/unity3d:2019.2.5f1-mac
steps:
- checkout
- run: mkdir -p /root/.cache/unity3d
- run: mkdir -p /root/.local/share/unity3d/Unity/
- run: openssl aes-256-cbc -d -in .circleci/Unity_v2019-mac.x.ulf-cipher -k ${CIPHER_KEY_MAC} >> /root/.local/share/unity3d/Unity/Unity_lic.ulf
- attach_workspace:
at: /core-builds/bin
- run: mkdir -p ./Zilon.Client/Assets/Plugins/ && cp -a /core-builds/bin/. ./Zilon.Client/Assets/Plugins/
- run:
command: |
apt update && apt install -y git
git clone https://github.com/kreghek/Zilon_Roguelike_Plugins.git temp
- run: cp -a temp/. ./Zilon.Client/Assets/Plugins/
- run:
name: Build
command: chmod +x .circleci/buildMacOsx32.sh && .circleci/buildMacOsx32.sh
- run:
name: Zipping build
command: apt update && apt -y install zip && zip -r /root/LAST_MacOsx32.zip ./Zilon.Client/Builds/*
- store_artifacts:
path: /root/LAST_MacOsx32.zip
build_MacOS_Universal:
docker:
- image: gableroux/unity3d:2019.2.5f1-mac
steps:
- checkout
- run: mkdir -p /root/.cache/unity3d
- run: mkdir -p /root/.local/share/unity3d/Unity/
- run: openssl aes-256-cbc -d -in .circleci/Unity_v2019-mac.x.ulf-cipher -k ${CIPHER_KEY_MAC} >> /root/.local/share/unity3d/Unity/Unity_lic.ulf
- attach_workspace:
at: /core-builds/bin
- run: mkdir -p ./Zilon.Client/Assets/Plugins/ && cp -a /core-builds/bin/. ./Zilon.Client/Assets/Plugins/
- run:
command: |
apt update && apt install -y git
git clone https://github.com/kreghek/Zilon_Roguelike_Plugins.git temp
- run: cp -a temp/. ./Zilon.Client/Assets/Plugins/
- run:
name: Build
command: chmod +x .circleci/buildMacOsxUniversal.sh && .circleci/buildMacOsxUniversal.sh
- run:
name: Zipping build
command: apt update && apt -y install zip && zip -r /root/LAST_MacOsxUniversal.zip ./Zilon.Client/Builds/*
- store_artifacts:
path: /root/LAST_MacOsxUniversal.zip
test_mass_sector_generator:
working_directory: /test_mass_sector_generator
docker:
Expand Down Expand Up @@ -388,14 +218,6 @@ workflows:
- test_45
- test_di
# Спеки на неработают под netcore3.1
# Разобраться и восстановить позже
- test_specflow
- build_Win_x64:
requires:
- build
- test_45
- test_di
# Спеки на неработают под netcore3.1
# Разобраться и восстановить позже
- test_specflow
release:
Expand All @@ -405,38 +227,6 @@ workflows:
branches:
only:
- /release.*/
- build_Win_x64:
requires:
- build
filters:
branches:
only:
- /release.*/
- build_Win_x32:
requires:
- build
filters:
branches:
only:
- /release.*/
- build_Linux_x64:
requires:
- build
filters:
branches:
only:
- /release.*/
- build_MacOS_Universal:
requires:
- build
filters:
branches:
only:
- /release.*/
# - build_Linux_x32:
# requires:
# - build
# - test_45
nightly:
triggers:
- schedule:
Expand Down Expand Up @@ -477,34 +267,6 @@ workflows:
# - test_45
# - test_di
# - test_specflow
- build_Win_x64:
requires:
- build
- test_45
- test_di
# Спеки на неработают под netcore3.1
# Разобраться и восстановить позже
# - test_specflow
- build_Win_x32:
requires:
- build
- test_45
- test_di
# Спеки на неработают под netcore3.1
# Разобраться и восстановить позже
# - test_specflow
- build_Linux_x64:
requires:
- build
- test_45
- test_di
# Спеки на неработают под netcore3.1
# Разобраться и восстановить позже
# - test_specflow
- build_MacOS_Universal:
requires:
- build
- test_45
# Спеки на неработают под netcore3.1
# Разобраться и восстановить позже
# - test_specflow
Expand Down
5 changes: 0 additions & 5 deletions .dependabot/config.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
title: '[BUG]'
labels: 'bug'
assignees: 'kreghek'

---

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/custom.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Custom issue template
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''
assignees: 'kreghek'

---

Expand Down
17 changes: 9 additions & 8 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
title: '[FEATRUE]'
labels: 'enhancement'
assignees: 'kreghek'

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Problem**

**Describe the solution you'd like**
A clear and concise description of what you want to happen.
Is your feature request related to a problem? A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe alternatives you've considered**
**Solution**
Describe the solution you'd like. A clear and concise description of what you want to happen.

**Alternatives**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Expand Down
32 changes: 32 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
version: 2
updates:
- package-ecosystem: nuget
directory: "/Zilon.Core"
schedule:
interval: weekly
open-pull-requests-limit: 10
ignore:
- dependency-name: Microsoft.CodeAnalysis.Analyzers
versions:
- "> 2.6.1"
- dependency-name: Microsoft.CodeAnalysis.Common
versions:
- "> 2.9.0"
- dependency-name: Microsoft.CodeAnalysis.CSharp
versions:
- "> 2.9.0"
- dependency-name: Microsoft.CodeAnalysis.VersionCheckAnalyzer
versions:
- "> 2.9.3"
- dependency-name: Microsoft.DotNet.PlatformAbstractions
versions:
- "> 2.1.0"
- dependency-name: Microsoft.NetFramework.Analyzers
versions:
- "> 2.9.3"
- dependency-name: System.Management
versions:
- "> 4.5.0"
- dependency-name: System.Runtime.Extensions
versions:
- "> 4.3.0"
9 changes: 9 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
*Changes*

- ...

*Checklist*

- [x] Read the contribution [guide](../blob/master/CONTRIBUTING.md) and accept the [code of conduct](../blob/master/CODE_OF_CONDUCT.md)
- [ ] [Readme](../blob/master/CODE_OF_CONDUCT.md) and [The Rulebook](https://last-imperial-vagabond.github.io/LAST_IMPERIAL_VAGABOND.github.io/rules/title.html) (updated or not needed)
- [ ] Tests (added, updated or not needed)
11 changes: 8 additions & 3 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@ categories:
- 'bugfix'
- 'bug'
- title: '🧰 Codebase improvements'
label: 'code improvement'
labels:
- 'code improvement'
- 'continuous integration'
- 'documentarium'
change-template: |
- **$TITLE** (#$NUMBER)
$BODY
### $TITLE (#$NUMBER)
$BODY
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
version-resolver:
major:
Expand All @@ -30,6 +34,7 @@ version-resolver:
include-labels:
- 'release-significant'
prerelease: true
sort-direction: ascending
template: |
## What's news
Expand Down
Loading

0 comments on commit c03cc8e

Please sign in to comment.