UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source 
# Conflicts:
#	.github/workflows/spine-godot.yml
#	.gitignore
This commit is contained in:
Mario Zechner 2022-07-18 10:28:25 +02:00
commit 947ff88b14
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/spine-godot.yml vendored
View File

@ -2,21 +2,11 @@ name: Build and Publish Godot editor and templates
on: on:
push: push:
branches:
- "4.2-beta"
- "4.2"
- "4.3-beta"
- "4.3"
paths: paths:
- ".github/workflows/spine-godot.yml" - ".github/workflows/spine-godot.yml"
- 'spine-godot/**' - 'spine-godot/**'
- 'spine-cpp/**' - 'spine-cpp/**'
workflow_dispatch: workflow_dispatch:
branches:
- "4.2-beta"
- "4.2"
- "4.3-beta"
- "4.3"
env: env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

2
.gitignore vendored
View File

@ -177,4 +177,4 @@ spine-cocos2dx/example/build-macos
spine-godot/logs spine-godot/logs
!spine-godot/build !spine-godot/build
spine-ts/spine-ts.zip spine-ts/spine-ts.zip
*.d *.d