diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f519ebb..9e3fff4 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -6,10 +6,10 @@ on: - 'v*' jobs: - export-windows: - name: Export Windows + release: + name: Build & Release runs-on: ubuntu-latest - timeout-minutes: 45 + timeout-minutes: 30 steps: - name: Setup SSH config for Gitea run: | @@ -51,55 +51,8 @@ jobs: mkdir -p build godot --headless --export-release "Windows Desktop" build/tekton_armageddon_windows.exe - - uses: actions/upload-artifact@v4 - with: - name: tekton-windows - path: build/tekton_armageddon_windows.exe - retention-days: 7 - - export-linux: - name: Export Linux - runs-on: ubuntu-latest - timeout-minutes: 45 - steps: - - name: Setup SSH config for Gitea - run: | - echo -e "Host gitea\n HostName 100.79.174.108\n Port 222\n StrictHostKeyChecking no" >> /etc/ssh/ssh_config - - - uses: actions/checkout@v4 - with: - ssh-key: ${{ secrets.TEKTON_SSH_KEY }} - ssh-strict: false - - - name: Setup Godot - run: | - if [ -f /cache/Godot_v4.6-stable_linux.x86_64.zip ]; then - cp /cache/Godot_v4.6-stable_linux.x86_64.zip ./godot.zip - else - wget -q https://github.com/godotengine/godot-builds/releases/download/4.6-stable/Godot_v4.6-stable_linux.x86_64.zip -O godot.zip - fi - unzip -q godot.zip - mv Godot_v4.6-stable_linux.x86_64 /usr/local/bin/godot - chmod +x /usr/local/bin/godot - - - name: Install export templates - run: | - mkdir -v -p ~/.local/share/godot/export_templates/4.6.stable - if [ -f /cache/Godot_v4.6-stable_export_templates.tpz ]; then - cp /cache/Godot_v4.6-stable_export_templates.tpz /tmp/godot-templates.tpz - else - wget -q https://github.com/godotengine/godot-builds/releases/download/4.6-stable/Godot_v4.6-stable_export_templates.tpz -O /tmp/godot-templates.tpz - fi - unzip -o -q /tmp/godot-templates.tpz -d /tmp/godot-templates - if [ -d /tmp/godot-templates/templates ]; then - cp -a /tmp/godot-templates/templates/* ~/.local/share/godot/export_templates/4.6.stable/ - else - cp -a /tmp/godot-templates/* ~/.local/share/godot/export_templates/4.6.stable/ - fi - - name: Export Linux run: | - mkdir -p build godot --headless --export-release "Linux/X11" build/tekton_armageddon_linux.x86_64 - name: Build PCK @@ -108,33 +61,10 @@ jobs: mkdir -p build mv patch.pck build/tekton_armageddon.pck 2>/dev/null || true - - uses: actions/upload-artifact@v4 - with: - name: tekton-linux - path: | - build/tekton_armageddon_linux.x86_64 - build/tekton_armageddon.pck - retention-days: 7 + - name: List build artifacts + run: ls -lh build/ - release: - name: Create Release - runs-on: ubuntu-latest - timeout-minutes: 15 - needs: [export-windows, export-linux] - permissions: - contents: write - steps: - - uses: actions/download-artifact@v4 - with: - name: tekton-windows - path: artifacts - - - uses: actions/download-artifact@v4 - with: - name: tekton-linux - path: artifacts - - - name: Get or create Gitea release + - name: Create release id: gitea_release env: GITEA_TOKEN: ${{ secrets.TEKTON_RELEASE_TOKEN }} @@ -158,7 +88,7 @@ jobs: curl -X POST \ -H "Authorization: token ${{ secrets.TEKTON_RELEASE_TOKEN }}" \ -H "Content-Type: multipart/form-data" \ - -F "attachment=@artifacts/tekton_armageddon_windows.exe" \ + -F "attachment=@build/tekton_armageddon_windows.exe" \ "https://git.klud.top/api/v1/repos/danchie/tekton/releases/${{ steps.gitea_release.outputs.release_id }}/assets" - name: Upload Linux asset @@ -166,7 +96,7 @@ jobs: curl -X POST \ -H "Authorization: token ${{ secrets.TEKTON_RELEASE_TOKEN }}" \ -H "Content-Type: multipart/form-data" \ - -F "attachment=@artifacts/tekton_armageddon_linux.x86_64" \ + -F "attachment=@build/tekton_armageddon_linux.x86_64" \ "https://git.klud.top/api/v1/repos/danchie/tekton/releases/${{ steps.gitea_release.outputs.release_id }}/assets" - name: Upload PCK asset @@ -174,5 +104,5 @@ jobs: curl -X POST \ -H "Authorization: token ${{ secrets.TEKTON_RELEASE_TOKEN }}" \ -H "Content-Type: multipart/form-data" \ - -F "attachment=@artifacts/tekton_armageddon.pck" \ + -F "attachment=@build/tekton_armageddon.pck" \ "https://git.klud.top/api/v1/repos/danchie/tekton/releases/${{ steps.gitea_release.outputs.release_id }}/assets"