Remove asset import job

This commit is contained in:
Leroy Hopson 2024-02-24 15:48:48 +13:00
parent 5c175d9192
commit 60054e7ee0
No known key found for this signature in database
GPG key ID: D2747312A6DB51AA
3 changed files with 12 additions and 99 deletions

View file

@ -1,21 +0,0 @@
name: Import assets
inputs:
godot-version:
required: true
runs:
using: "composite"
steps:
- name: Setup Godot
uses: lihop/setup-godot@v2
with:
version: ${{ inputs.godot-version }}
- name: Install just
uses: taiki-e/install-action@just
- name: Install dev dependencies
shell: bash
run: just install
- name: Import assets
shell: bash
run: |
# HACK: See https://github.com/godotengine/godot-proposals/issues/1362.
(for i in {1..4}; do godot --editor --headless & sleep 5 && .github/actions/import-assets/monitor_import.sh; done) || true

View file

@ -1,10 +0,0 @@
#!/bin/sh
# Source: https://github.com/godotengine/godot/pull/68461#issuecomment-1328177902
while [ "$(printf "%.0f\n" $(top -n 1 -b | awk '/^%Cpu/{print $2}'))" -gt 10 ];
do
echo "$(top -n 1 -b | awk '/^%Cpu/{print $2}')";
done
echo "Finished importing. Killing godot editor process";
kill -9 $(pgrep -o godot)

View file

@ -6,32 +6,6 @@ on:
- cron: 0 11 * * * - cron: 0 11 * * *
jobs: jobs:
import-assets:
name: "Import Assets"
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
platform: [linux, macos, windows]
include:
- platform: linux
os: ubuntu-22.04
- platform: macos
os: macos-12
- platform: windows
os: windows-2022
steps:
- uses: actions/checkout@v4
- name: Import assets
uses: ./.github/actions/import-assets
with:
godot-version: v4.2.1-stable
- name: Upload imports
uses: actions/upload-artifact@v4
with:
name: imports-${{ matrix.platform }}
path: .godot/
build-linux: build-linux:
name: Build (linux, ${{ matrix.arch }}, ${{ matrix.target }}) name: Build (linux, ${{ matrix.arch }}, ${{ matrix.target }})
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
@ -206,18 +180,8 @@ jobs:
uses: lihop/setup-godot@v2 uses: lihop/setup-godot@v2
with: with:
version: "4.2.1-stable" version: "4.2.1-stable"
export-templates: true - name: Import assets
- name: Wait for asset import run: godot --editor --headless --quit-after 100 || true
uses: fountainhead/action-wait-for-check@v1.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
checkName: Import Assets (linux)
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- name: Download imports
uses: actions/download-artifact@v4
with:
name: imports-linux
path: .godot
- name: Wait for build - name: Wait for build
uses: fountainhead/action-wait-for-check@v1.1.0 uses: fountainhead/action-wait-for-check@v1.1.0
with: with:
@ -227,7 +191,6 @@ jobs:
- name: Install binary build artifacts - name: Install binary build artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: libgodot-xterm-web-wasm32-release
path: addons/godot_xterm/native/bin path: addons/godot_xterm/native/bin
# Some remaining steps temporarily disabled. # Some remaining steps temporarily disabled.
- name: Export HTML5 - name: Export HTML5
@ -308,19 +271,16 @@ jobs:
uses: lihop/setup-godot@v2 uses: lihop/setup-godot@v2
with: with:
version: "4.2.1-stable" version: "4.2.1-stable"
- uses: taiki-e/install-action@just - name: Install molten-vk
- run: just install if: ${{ matrix.platform == 'macos' && matrix.test-type == 'rendering' }}
- name: Wait for asset import run: brew install molten-vk
uses: fountainhead/action-wait-for-check@v1.1.0 - name: Install just
with: uses: taiki-e/install-action@just
token: ${{ secrets.GITHUB_TOKEN }} - name: Install dependencies
checkName: Import Assets (${{ matrix.platform }}) run: just install
ref: ${{ github.event.pull_request.head.sha || github.sha }} - name: Import assets
- name: Download imports shell: bash
uses: actions/download-artifact@v4 run: godot --editor --headless --quit-after 100 || true
with:
name: imports-${{ matrix.platform }}
path: .godot
- name: Wait for build - name: Wait for build
uses: fountainhead/action-wait-for-check@v1.1.0 uses: fountainhead/action-wait-for-check@v1.1.0
with: with:
@ -330,14 +290,7 @@ jobs:
- name: Install binary build artifacts - name: Install binary build artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: libgodot-xterm-${{ matrix.platform }}-${{ matrix.arch }}-debug
path: addons/godot_xterm/native/bin path: addons/godot_xterm/native/bin
- name: Install molten-vk
if: ${{ matrix.platform == 'macos' && matrix.test-type == 'rendering' }}
run: brew install molten-vk
- name: Re-run editor
if: ${{ matrix.platform == 'macos' }}
run: godot --editor --headless --quit-after 100 || true # Required for macos to detect GutUtils class.
- name: Test - name: Test
shell: bash shell: bash
run: | run: |
@ -361,15 +314,6 @@ jobs:
pattern: "*-${{ matrix.target }}" pattern: "*-${{ matrix.target }}"
delete-merged: true delete-merged: true
delete-asset-imports:
name: Delete Asset Imports
runs-on: ubuntu-22.04
needs: [test, html5-export]
steps:
- uses: geekyeggo/delete-artifact@v2
with:
name: imports-*
# Git archive should only include addons/godot_xterm directory. # Git archive should only include addons/godot_xterm directory.
check-archive: check-archive:
name: "Check Archive" name: "Check Archive"