Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GHA improvements #154

Merged
merged 2 commits into from
Jul 1, 2024
Merged

GHA improvements #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e330578
GHA: Build nothreads variant of web templates
limbonaut Jul 1, 2024
ed19d78
GHA: Install Wayland deps for Linux builds
limbonaut Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ jobs:
with:
arch: ${{matrix.opts.arch}}

- name: Set up Wayland deps
run: |
sudo apt-get install libwayland-dev

- name: Set up scons cache
uses: actions/cache@v4
with:
Expand Down
40 changes: 34 additions & 6 deletions .github/workflows/web.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,42 @@ jobs:
include:
- name: Template (release)
target: template_release
threads: true
dlink: false

- name: Template (release, dlink_enabled=true)
- name: Template (release, dlink)
target: template_release
threads: true
dlink: true

- name: Template (debug)
target: template_debug
threads: true
dlink: false

- name: Template (debug, dlink_enabled=true)
- name: Template (debug, dlink)
target: template_debug
threads: true
dlink: true

- name: Template (release, nothreads)
target: template_release
threads: false
dlink: false

- name: Template (release, nothreads, dlink)
target: template_release
threads: false
dlink: true

- name: Template (debug, nothreads)
target: template_debug
threads: false
dlink: false

- name: Template (debug, nothreads, dlink)
target: template_debug
threads: false
dlink: true

env:
Expand Down Expand Up @@ -110,20 +134,24 @@ jobs:
env:
SCONS_CACHE: ${{github.workspace}}/.scons_cache/
run: |
scons platform=web target=${{matrix.target}} dlink_enabled=${{matrix.dlink}} ${{env.SCONSFLAGS}}
scons platform=web target=${{matrix.target}} threads=${{matrix.threads}} dlink_enabled=${{matrix.dlink}} ${{env.SCONSFLAGS}}

- name: Prepare artifacts
run: |
mkdir -p out/templates/
mv bin/godot.web.template_release.wasm32.zip out/templates/web_release.zip || true
mv bin/godot.web.template_release.wasm32.dlink.zip out/templates/web_dlink_release.zip || true
mv bin/godot.web.template_debug.wasm32.zip out/templates/web_debug.zip || true
mv bin/godot.web.template_debug.wasm32.nothreads.zip out/templates/web_nothreads_debug.zip || true
mv bin/godot.web.template_debug.wasm32.dlink.zip out/templates/web_dlink_debug.zip || true
mv bin/godot.web.template_debug.wasm32.nothreads.dlink.zip out/templates/web_dlink_nothreads_debug.zip || true
mv bin/godot.web.template_release.wasm32.zip out/templates/web_release.zip || true
mv bin/godot.web.template_release.wasm32.nothreads.zip out/templates/web_nothreads_release.zip || true
mv bin/godot.web.template_release.wasm32.dlink.zip out/templates/web_dlink_release.zip || true
mv bin/godot.web.template_release.wasm32.nothreads.dlink.zip out/templates/web_dlink_nothreads_release.zip || true
rm -rf bin/
echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > out/templates/version.txt

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: ${{env.NAME_PREFIX}}.${{matrix.target}}.web${{matrix.dlink == true && '.dlink' || ''}}
name: ${{env.NAME_PREFIX}}.${{matrix.target}}.web${{matrix.threads == false && '.nothreads' || ''}}${{matrix.dlink == true && '.dlink' || ''}}
path: out/*
Loading