From d79ca44972192458ffabec6e064a52c7a42e5b4e Mon Sep 17 00:00:00 2001 From: Minimata Date: Mon, 26 Jan 2026 09:26:54 +0100 Subject: [PATCH] everything should work fine now --- .gitea/workflows/dev-branch.yaml | 5 +- .gitea/workflows/main.yaml | 150 +++++++++++++++---------------- 2 files changed, 76 insertions(+), 79 deletions(-) diff --git a/.gitea/workflows/dev-branch.yaml b/.gitea/workflows/dev-branch.yaml index aa356dbf..0648d3b3 100644 --- a/.gitea/workflows/dev-branch.yaml +++ b/.gitea/workflows/dev-branch.yaml @@ -37,7 +37,7 @@ jobs: git config -f $AUTH_FILE http.${{ gitea.server_url }}/${{ gitea.repository }}.git/info/lfs/objects/batch.extraheader "$AUTH" git lfs pull - - name: Launch Godot + - name: Run tests uses: godot-gdunit-labs/gdUnit4-action@v1 with: godot-version: '4.5.1' @@ -50,9 +50,6 @@ jobs: timeout: 1 publish-report: false upload-report: false - - - name: Test action - run: echo ${{ github.workspace }} - name: Upload test report uses: actions/upload-artifact@v3-node20 diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 38bb89a4..0994646b 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -13,76 +13,76 @@ env: ITCHIO_GAMEID: MovementTests jobs: -# BumpTag: -# runs-on: ubuntu-latest -# outputs: -# tag_name: ${{ steps.bump-tag.outputs.new_tag }} -# steps: -# - name: Check out repository code -# uses: actions/checkout@v4 -# with: -# lfs: false -# - name: Remove buggy pre-push hook -# run: | -# rm -f .git/hooks/pre-push -# - name: Bump version and push tag -# id: bump-tag -# uses: anothrNick/github-tag-action@v1 -# env: -# GITHUB_TOKEN: ${{ secrets.TOKEN }} -# GIT_API_TAGGING: false -# WITH_V: true -# PRERELEASE: false -# INITIAL_VERSION: 0.1.0 -# DEFAULT_BUMP: patch + BumpTag: + runs-on: ubuntu-latest + outputs: + tag_name: ${{ steps.bump-tag.outputs.new_tag }} + steps: + - name: Check out repository code + uses: actions/checkout@v4 + with: + lfs: false + - name: Remove buggy pre-push hook + run: | + rm -f .git/hooks/pre-push + - name: Bump version and push tag + id: bump-tag + uses: anothrNick/github-tag-action@v1 + env: + GITHUB_TOKEN: ${{ secrets.TOKEN }} + GIT_API_TAGGING: false + WITH_V: true + PRERELEASE: false + INITIAL_VERSION: 0.1.0 + DEFAULT_BUMP: patch -# Test: -# runs-on: ubuntu-latest -# steps: -# - name: Install node, xvfb and curl -# run: | -# apt update && apt -y install curl nodejs xvfb -# -# - name: Checkout -# uses: actions/checkout@v6 -# with: -# lfs: false -# persist-credentials: true -# -# - name: Checkout LFS -# run: | -# git lfs install --local -# AUTH=$(git config http.${{ gitea.server_url }}/.extraheader) -# AUTH_FILE=$(git config includeif.gitdir:/workspace/${{ gitea.repository }}/.git.path) -# git config -f $AUTH_FILE --unset http.${{ gitea.server_url }}/.extraheader -# git config -f $AUTH_FILE http.${{ gitea.server_url }}/${{ gitea.repository }}.git/info/lfs/objects/batch.extraheader "$AUTH" -# git lfs pull -# -# - name: Launch Godot -# uses: godot-gdunit-labs/gdUnit4-action@v1 -# with: -# godot-version: '4.5.1' -# godot-net: true -# godot-force-mono: true -# dotnet-version: 'net9.0' -# version: 'v6.0.3' -# paths: | -# res://tests/ -# timeout: 1 -# publish-report: false -# upload-report: false -# -# - name: Upload test report -# uses: actions/upload-artifact@v3-node20 -# with: -# name: Test Report -# path: ${{ github.workspace }}/reports/test-result.html + Test: + runs-on: ubuntu-latest + steps: + - name: Install node, xvfb and curl + run: | + apt update && apt -y install curl nodejs xvfb + + - name: Checkout + uses: actions/checkout@v6 + with: + lfs: false + persist-credentials: true + + - name: Checkout LFS + run: | + git lfs install --local + AUTH=$(git config http.${{ gitea.server_url }}/.extraheader) + AUTH_FILE=$(git config includeif.gitdir:/workspace/${{ gitea.repository }}/.git.path) + git config -f $AUTH_FILE --unset http.${{ gitea.server_url }}/.extraheader + git config -f $AUTH_FILE http.${{ gitea.server_url }}/${{ gitea.repository }}.git/info/lfs/objects/batch.extraheader "$AUTH" + git lfs pull + + - name: Run tests + uses: godot-gdunit-labs/gdUnit4-action@v1 + with: + godot-version: '4.5.1' + godot-net: true + godot-force-mono: true + dotnet-version: 'net9.0' + version: 'v6.0.3' + paths: | + res://tests/ + timeout: 1 + publish-report: false + upload-report: false + + - name: Upload test report + uses: actions/upload-artifact@v3-node20 + with: + name: Test Report + path: ${{ github.workspace }}/reports/test-result.html Export: runs-on: ubuntu-latest -# needs: -# - BumpTag -# - Test # Wait for tests to finish + needs: + - BumpTag + - Test # Wait for tests to finish container: image: barichello/godot-ci:mono-4.5 @@ -119,12 +119,12 @@ jobs: 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.BumpTag.outputs.tag_name }} -# gameData: Windows.zip -# buildChannel: 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.BumpTag.outputs.tag_name }} + gameData: Windows.zip + buildChannel: windows