From 51b7328310b722649d5d7580fda23132c5ced216 Mon Sep 17 00:00:00 2001 From: Minimata Date: Wed, 28 Jan 2026 17:54:06 +0100 Subject: [PATCH] changing itch action --- .gitea/workflows/dev-branch.yaml | 36 ++++---------------- .gitea/workflows/main.yaml | 50 ++++++++++++---------------- .gitea/workflows/release-branch.yaml | 39 +++++----------------- 3 files changed, 38 insertions(+), 87 deletions(-) diff --git a/.gitea/workflows/dev-branch.yaml b/.gitea/workflows/dev-branch.yaml index 4ef58857..e6539c8f 100644 --- a/.gitea/workflows/dev-branch.yaml +++ b/.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 - env: - RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache + runs-on: godot steps: - - name: Install node, xvfb and curl - run: | - apt update && apt -y install curl nodejs xvfb + - name: Checkout with LFS + uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main - - 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' @@ -56,9 +34,9 @@ jobs: timeout: 1 publish-report: false 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 \ No newline at end of file diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index dddd3aac..f4ca0713 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -43,20 +43,8 @@ jobs: # env: # RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache steps: - - name: Checkout - uses: actions/checkout@v4 - 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: Checkout with LFS + uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main - 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: -# RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache -# needs: -# - BumpTag -# - Test # Wait for tests to finish + needs: + - BumpTag steps: - name: Checkout with LFS @@ -109,12 +94,21 @@ jobs: pwd echo ${{ github.workspace }} - - name: Upload to Itch - uses: KikimoraGames/itch-publish@v0.0.3 + - uses: Oval-Tutu/publish-to-itch-with-butler@v1 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 + api-key: ${{ secrets.BUTLER_TOKEN }} + itch_user: ${{ env.ITCHIO_USERNAME }} + itch_game: ${{ env.ITCHIO_GAMEID }} + channel: windows + package: Windows.zip + 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 diff --git a/.gitea/workflows/release-branch.yaml b/.gitea/workflows/release-branch.yaml index d704fa1a..1787c9bc 100644 --- a/.gitea/workflows/release-branch.yaml +++ b/.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 - run: | - apt update && apt -y install curl zip nodejs + - name: Checkout with LFS + uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main - - name: Checkout - uses: actions/checkout@v3 + - name: Setup Godot + id: setup-godot + uses: https://git.game-dev.space/minimata/setup-godot.git@main 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: Import resources and build solution - run: | - godot --headless --editor --build-solutions --quit --import --path $PWD + godot-version: '4.6' + dotnet-version: 'net9.0' - name: Build Windows run: |