From 8a552f7993996e26ae5f41101820df34d5f4db85 Mon Sep 17 00:00:00 2001 From: Minimata Date: Wed, 28 Jan 2026 18:28:40 +0100 Subject: [PATCH] #minor CI FIXED --- .gitea/workflows/dev-branch.yaml | 2 +- .gitea/workflows/main.yaml | 16 +---- .gitea/workflows/release-branch.yaml | 87 ++++++++++++++++------------ 3 files changed, 52 insertions(+), 53 deletions(-) diff --git a/.gitea/workflows/dev-branch.yaml b/.gitea/workflows/dev-branch.yaml index e6539c8f..d316e525 100644 --- a/.gitea/workflows/dev-branch.yaml +++ b/.gitea/workflows/dev-branch.yaml @@ -36,7 +36,7 @@ jobs: upload-report: false - name: Upload test report - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v3-node20 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 6df01e27..d58aebe6 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -91,11 +91,6 @@ jobs: ${{ steps.setup-godot.outputs.godot_bin }} --headless --verbose --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe zip -r Windows.zip build/windows - - name: List files - run: | - ls -la - pwd - - name: Setup Butler shell: bash env: @@ -118,13 +113,4 @@ jobs: ./tools/butler push \ "Windows.zip" \ ${{ env.ITCHIO_USERNAME }}/${{ env.ITCHIO_GAMEID }}:windows ${versionArgument} - -# - 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 1787c9bc..e6b5058b 100644 --- a/.gitea/workflows/release-branch.yaml +++ b/.gitea/workflows/release-branch.yaml @@ -40,64 +40,77 @@ jobs: uses: https://git.game-dev.space/minimata/setup-godot.git@main with: godot-version: '4.6' - dotnet-version: 'net9.0' + dotnet-version: 'net9.0' + + - name: Setup Butler + shell: bash + env: + BUTLER_API_KEY: ${{ secrets.BUTLER_TOKEN }} + run: | + mkdir ./tools 2>/dev/null || true + pushd tools + curl -sSLfo ./butler.zip "https://broth.itch.zone/butler/linux-amd64/LATEST/archive/default" + unzip butler.zip + chmod +x ./butler + popd + ./tools/butler -V - name: Build Windows run: | mkdir -v -p build/windows godot --headless --verbose --build-solutions --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe zip -r Windows.zip build/windows - - 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: ${{ needs.ReleaseName.outputs.release_name }} - gameData: Windows.zip - buildChannel: windows + - name: Upload Windows to itch.io + shell: bash + env: + BUTLER_API_KEY: ${{ secrets.BUTLER_TOKEN }} + run: | + versionArgument="--userversion ${{ needs.ReleaseName.outputs.release_name }}" + ./tools/butler push \ + "Windows.zip" \ + ${{ env.ITCHIO_USERNAME }}/${{ env.ITCHIO_GAMEID }}:windows ${versionArgument} - name: Build Windows ARM run: | mkdir -v -p build/windowsArm godot --headless --verbose --build-solutions --export-release "Windows ARM" build/windowsArm/${{ env.GAME_NAME }}.exe zip -r WindowsArm.zip build/windowsArm - - 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: ${{ needs.ReleaseName.outputs.release_name }} - gameData: WindowsArm.zip - buildChannel: windows-arm + - name: Upload Windows to itch.io + shell: bash + env: + BUTLER_API_KEY: ${{ secrets.BUTLER_TOKEN }} + run: | + versionArgument="--userversion ${{ needs.ReleaseName.outputs.release_name }}" + ./tools/butler push \ + "WindowsArm.zip" \ + ${{ env.ITCHIO_USERNAME }}/${{ env.ITCHIO_GAMEID }}:windows-arm ${versionArgument} - name: Linux Build run: | mkdir -v -p build/linux godot --headless --verbose --export-release "Linux/X11" build/linux/${{ env.GAME_NAME }}.x86_64 zip -r Linux.zip build/linux - - 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: ${{ needs.ReleaseName.outputs.release_name }} - gameData: Linux.zip - buildChannel: linux + - name: Upload Windows to itch.io + shell: bash + env: + BUTLER_API_KEY: ${{ secrets.BUTLER_TOKEN }} + run: | + versionArgument="--userversion ${{ needs.ReleaseName.outputs.release_name }}" + ./tools/butler push \ + "Linux.zip" \ + ${{ env.ITCHIO_USERNAME }}/${{ env.ITCHIO_GAMEID }}:linux ${versionArgument} - name: Mac Build run: | mkdir -v -p build/mac godot --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip zip -r Mac.zip build/mac - - 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: ${{ needs.ReleaseName.outputs.release_name }} - gameData: Mac.zip - buildChannel: mac + - name: Upload Windows to itch.io + shell: bash + env: + BUTLER_API_KEY: ${{ secrets.BUTLER_TOKEN }} + run: | + versionArgument="--userversion ${{ needs.ReleaseName.outputs.release_name }}" + ./tools/butler push \ + "Mac.zip" \ + ${{ env.ITCHIO_USERNAME }}/${{ env.ITCHIO_GAMEID }}:mac ${versionArgument}