changing itch action

.gitea/workflows/dev-branch.yaml

@@ -10,44 +10,22 @@ on:
       - "**"
 
 env:
+  GODOT_VERSION: 4.6
   GAME_NAME: MovementTests
   ITCHIO_USERNAME: Minimata
   ITCHIO_GAMEID: MovementTests
 
 jobs:
   Export:
-    runs-on: ubuntu-latest
+    runs-on: godot
-    env:
-      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
     steps:
-      - name: Install node, xvfb and curl
+      - name: Checkout with LFS
-        run: |
+        uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main
-          apt update && apt -y install curl nodejs xvfb    
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          lfs: false
-
-      - name: Checkout LFS
-        run: |
-          UrlBase=$GITHUB_SERVER_URL; \
-          UrlLfsBase=$UrlBase/${{ gitea.repository }}.git/info/lfs/objects; \
-          Auth=`/usr/bin/git config --get --local http.$UrlBase/.extraheader`; \
-          /usr/bin/git config --local http.${UrlLfsBase}/batch.extraheader "$Auth"; \
-          /usr/bin/git config --local http.${UrlLfsBase}/.extraheader ''
-
-          git config --local lfs.transfer.maxretries 1
-
-          /usr/bin/git lfs fetch    origin refs/remotes/origin/${{ gitea.ref_name }}
-          /usr/bin/git lfs checkout
-          /usr/bin/git add .
-          /usr/bin/git reset --hard
 
       - name: Run tests
         uses: godot-gdunit-labs/gdUnit4-action@v1
         with:
-          godot-version: '4.6.0'
+          godot-version: ${GODOT_VERSION}
           godot-net: true
           godot-force-mono: true
           dotnet-version: 'net9.0'
@@ -58,7 +36,7 @@ jobs:
           upload-report: false
 
       - name: Upload test report
-        uses: actions/upload-artifact@v3-node20
+        uses: actions/upload-artifact@v6
         with:
           name: Test Report
           path: ${{ github.workspace }}/reports/test-result.html

.gitea/workflows/main.yaml

@@ -43,20 +43,8 @@ jobs:
 #    env:
 #      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
     steps:
-      - name: Checkout
+      - name: Checkout with LFS
-        uses: actions/checkout@v4
+        uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main
-        with:
-          token: ${{ secrets.TOKEN }}
-          lfs: false
-          persist-credentials: true
-          
-      - name: Checkout LFS
-        run: |
-          git lfs install --local
-          AUTH=$(git config http.${{ gitea.server_url }}/.extraheader)
-          git config --local --unset http.${{ github.server_url }}/.extraheader
-          git config --local http.${{ github.server_url }}/${{ github.repository }}.git/info/lfs/objects/batch.extraheader "$AUTH"
-          git lfs pull
 
       - name: Run tests
         uses: godot-gdunit-labs/gdUnit4-action@v1
@@ -72,18 +60,15 @@ jobs:
           upload-report: false
 
       - name: Upload test report
-        uses: actions/upload-artifact@v3-node20
+        uses: actions/upload-artifact@v6
         with:
           name: Test Report
           path: ${{ github.workspace }}/reports/test-result.html
 
   Export:
     runs-on: godot
-#    env:
+    needs: 
-#      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
+      - BumpTag
-#    needs: 
-#      - BumpTag
-#      - Test  # Wait for tests to finish
 
     steps:
       - name: Checkout with LFS
@@ -109,12 +94,21 @@ jobs:
           pwd
           echo ${{ github.workspace }}
           
-      - name: Upload to Itch
+      - uses: Oval-Tutu/publish-to-itch-with-butler@v1
-        uses: KikimoraGames/itch-publish@v0.0.3
         with:
-          butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
+          api-key: ${{ secrets.BUTLER_TOKEN }}
-          itchUsername: ${{ env.ITCHIO_USERNAME }}
+          itch_user: ${{ env.ITCHIO_USERNAME }}
-          itchGameId: ${{ env.ITCHIO_GAMEID }}
+          itch_game: ${{ env.ITCHIO_GAMEID }}
-          buildNumber: 0.1.0 # ${{ needs.BumpTag.outputs.tag_name }}
+          channel: windows
-          gameData: ${{ github.workspace }}/Windows.zip
+          package: Windows.zip
-          buildChannel: windows
+          version: ${{ needs.BumpTag.outputs.tag_name }}
+          
+#      - name: Upload to Itch
+#        uses: KikimoraGames/itch-publish@v0.0.3
+#        with:
+#          butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
+#          itchUsername: ${{ env.ITCHIO_USERNAME }}
+#          itchGameId: ${{ env.ITCHIO_GAMEID }}
+#          buildNumber: 0.1.0 # ${{ needs.BumpTag.outputs.tag_name }}
+#          gameData: ${{ github.workspace }}/Windows.zip
+#          buildChannel: windows

.gitea/workflows/release-branch.yaml

@@ -8,6 +8,7 @@ on:
       - "**"
 
 env:
+  GODOT_VERSION: 4.6
   GAME_NAME: MovementTests
   ITCHIO_USERNAME: Minimata
   ITCHIO_GAMEID: MovementTests
@@ -26,42 +27,20 @@ jobs:
           separator: '/'
 
   Release:
-    runs-on: ubuntu-latest
+    runs-on: godot
     if: ${{ contains(gitea.ref_name, 'release/') }}
     needs: ReleaseName
-    env:
-      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
-    container:
-      image: barichello/godot-ci:mono-4.6
 
     steps:
-      - name: Install node, curl and zip
+      - name: Checkout with LFS
-        run: |
+        uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main
-          apt update && apt -y install curl zip nodejs         
 
-      - name: Checkout
+      - name: Setup Godot
-        uses: actions/checkout@v3
+        id: setup-godot
+        uses: https://git.game-dev.space/minimata/setup-godot.git@main
         with:
-          lfs: false
+          godot-version: '4.6'
-
+          dotnet-version: 'net9.0'     
-      - name: Checkout LFS
-        run: |
-          UrlBase=$GITHUB_SERVER_URL; \
-          UrlLfsBase=$UrlBase/${{ gitea.repository }}.git/info/lfs/objects; \
-          Auth=`/usr/bin/git config --get --local http.$UrlBase/.extraheader`; \
-          /usr/bin/git config --local http.${UrlLfsBase}/batch.extraheader "$Auth"; \
-          /usr/bin/git config --local http.${UrlLfsBase}/.extraheader ''
-
-          git config --local lfs.transfer.maxretries 1
-
-          /usr/bin/git lfs fetch    origin refs/remotes/origin/${{ gitea.ref_name }}
-          /usr/bin/git lfs checkout
-          /usr/bin/git add .
-          /usr/bin/git reset --hard
-            
-      - name: Import resources and build solution
-        run: |
-          godot --headless --editor --build-solutions --quit --import --path $PWD          
           
       - name: Build Windows
         run: |