Skip to content

Commit

Permalink
Merge branch 'dev2' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
xrSimpodin committed May 9, 2020
2 parents c2499d4 + 2ad7e93 commit 20a2729
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 65 deletions.
3 changes: 2 additions & 1 deletion .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
* Внедрение новых возможностей для разработчиков

### [>>Разработчики<<](https://github.com/OGSR/OGSR-Engine/graphs/contributors) ###
### [>>Список изменений<<](https://github.com/OGSR/OGSR-Engine/wiki/Список-изменений) ###
### [>>Wiki, cписок изменений и прочая информация<<](https://github.com/OGSR/OGSR-Engine/wiki) ###
### [>>Свежий релиз<<](https://github.com/OGSR/OGSR-Engine/releases/latest) ###
### С багами и предложениями - [писать сюда](https://github.com/OGSR/OGSR-Engine/issues) ###
#### Для того, чтобы движок работал с WW-версией SHOC - используйте специальный ключ запуска ` -steam` ####

### Инструкции по сборке: ###
Expand Down
20 changes: 18 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
name: Main Workflow

# Trigger the workflow on push or pull request
on: [push, pull_request]
on:
push:
pull_request:
release:
types:
- created

jobs:
build:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
runs-on: windows-latest
strategy:
fail-fast: false
Expand Down Expand Up @@ -48,3 +53,14 @@ jobs:
with:
name: ${{ env.Build_type }}
path: .\${{ env.Build_type }}

- name: Upload release asset
if: github.event_name == 'release'
uses: actions/upload-release-asset@v1.0.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: .\${{ env.Build_type }}
asset_name: ${{ env.Build_type }}
asset_content_type: application/zip
62 changes: 0 additions & 62 deletions .github/workflows/tag.yml

This file was deleted.

Binary file not shown.

0 comments on commit 20a2729

Please sign in to comment.