From 5232d24e6f51470d6182915975111c292862fd29 Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Mon, 1 Apr 2024 09:36:10 +1300 Subject: [PATCH] fix(ci): wait for linux binaries when exporting to web Ensures we have both the linux and wasm binaries when exporting to web. The linux binaries are required as the host system uses linux and will fail to identify the GDExtension node types (PTY, Terminal) leading to the export not including them. Also removes the retry action as the initial export command was not returning an error exit code anyway. --- .github/workflows/main.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d1effca..e4b03a5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -189,24 +189,26 @@ jobs: export-templates: true - name: Import assets run: godot --editor --headless --quit-after 100 || true - - name: Wait for build + - name: Wait for wasm build uses: fountainhead/action-wait-for-check@v1.2.0 with: token: ${{ secrets.GITHUB_TOKEN }} checkName: "Build (web, wasm32, release) #${{ github.run_number }}/${{ github.run_attempt }}" ref: ${{ github.event.pull_request.head.sha || github.sha }} + - name: Wait for linux build # Required for linux-based editor to recognize the GDExtension node types. + uses: fountainhead/action-wait-for-check@v1.2.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + checkName: "Build (linux, x86_64, debug) #${{ github.run_number }}/${{ github.run_attempt }}" + ref: ${{ github.event.pull_request.head.sha || github.sha }} - name: Install binary build artifacts uses: actions/download-artifact@v4 with: path: addons/godot_xterm/native/bin merge-multiple: true - name: Export for web - uses: nick-fields/retry@v3 - with: - command: godot --no-window --export-release Web - retry_on: error - timeout_minutes: 5 - max_attempts: 6 + shell: bash + run: godot --no-window --export-release Web - name: NPM cache uses: c-hive/gha-npm-cache@v1 with: