Przeglądaj źródła

Merge branch '4.1' into 4.2-beta

# Conflicts:
#	.github/workflows/spine-godot.yml
#	.gitignore
Mario Zechner 3 lat temu
rodzic
commit
947ff88b14
2 zmienionych plików z 1 dodań i 11 usunięć
  1. 0 10
      .github/workflows/spine-godot.yml
  2. 1 1
      .gitignore

+ 0 - 10
.github/workflows/spine-godot.yml

@@ -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 }}

+ 1 - 1
.gitignore

@@ -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