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

Jump to bottom

Upgrade to Godot 4.3 #124

Merged
merged 11 commits into from
Oct 13, 2024
Merged

Upgrade to Godot 4.3 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8e3eb62
Upgrade project to Godot 4.3
jspahrsummers Oct 13, 2024
2935a57
Disable "unsafe cast" warning (false positives)
jspahrsummers Oct 13, 2024
502777f
Changes made by Godot
jspahrsummers Oct 13, 2024
5fc0595
Remove outdated TODO
jspahrsummers Oct 13, 2024
954cf0c
Rewrite `emit_signal`s as `emit()`
jspahrsummers Oct 13, 2024
a3a3b75
Update CI workflow
jspahrsummers Oct 13, 2024
5995685
Update export templates
jspahrsummers Oct 13, 2024
dafdf17
Build CI on this branch, but don't push
jspahrsummers Oct 13, 2024
0df56cc
Enable ETC2 ASTC compression
jspahrsummers Oct 13, 2024
e46bf5f
Single-quote strings for GH Actions syntax
jspahrsummers Oct 13, 2024
6574595
Typo in zip URL
jspahrsummers Oct 13, 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
19 changes: 11 additions & 8 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ on:
push:
branches:
- main
- godot-4.3

paths-ignore:
- ".gitattributes"
Expand Down Expand Up @@ -47,7 +48,7 @@ jobs:
- name: Install Godot
working-directory: ${{ env.RUNNER_TEMP }}
run: |
curl -sL https://github.com/godotengine/godot/releases/download/4.2.2-stable/Godot_v4.2.2-stable_macos.universal.zip -o godot.zip
curl -sL https://github.com/godotengine/godot/releases/download/4.3-stable/Godot_v4.3-stable_macos.universal.zip -o godot.zip
unzip godot.zip
mv Godot.app "$RUNNER_TEMP/Godot.app"

Expand All @@ -62,8 +63,8 @@ jobs:

- name: Prepare export templates
run: |
mkdir -p ~/Library/Application\ Support/Godot/export_templates/4.2.2.stable
mv build/export_templates/* ~/Library/Application\ Support/Godot/export_templates/4.2.2.stable/
mkdir -p ~/Library/Application\ Support/Godot/export_templates/4.3.stable
mv build/export_templates/* ~/Library/Application\ Support/Godot/export_templates/4.3.stable/

- name: Cache .godot
uses: actions/cache@v4
Expand Down Expand Up @@ -92,6 +93,7 @@ jobs:
xcrun stapler staple $RUNNER_TEMP/Merc.app

- name: Push to itch.io
if: ${{ github.event.ref == 'refs/heads/main' }}
env:
BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
run: |
Expand All @@ -104,9 +106,9 @@ jobs:
- name: Install Godot
working-directory: ${{ env.RUNNER_TEMP }}
run: |
curl -sL https://github.com/godotengine/godot/releases/download/4.2.2-stable/Godot_v4.2.2-stable_linux.x86_64.zip -o godot.zip
curl -sL https://github.com/godotengine/godot/releases/download/4.3-stable/Godot_v4.3-stable_linux.x86_64.zip -o godot.zip
unzip godot.zip
mv Godot_v4.2.2-stable_linux.x86_64 "$RUNNER_TEMP/godot"
mv Godot_v4.3-stable_linux.x86_64 "$RUNNER_TEMP/godot"

- name: Install butler
working-directory: ${{ env.RUNNER_TEMP }}
Expand All @@ -119,8 +121,8 @@ jobs:

- name: Prepare export templates
run: |
mkdir -p ~/.local/share/godot/export_templates/4.2.2.stable
mv build/export_templates/* ~/.local/share/godot/export_templates/4.2.2.stable/
mkdir -p ~/.local/share/godot/export_templates/4.3.stable
mv build/export_templates/* ~/.local/share/godot/export_templates/4.3.stable/

- name: Cache .godot
uses: actions/cache@v4
Expand All @@ -134,14 +136,15 @@ jobs:
"$RUNNER_TEMP/godot" --headless --export-release Windows

- name: Push to itch.io
if: ${{ github.event.ref == 'refs/heads/main' }}
env:
BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
run: |
"$RUNNER_TEMP/butler" push build/Windows "jspahrsummers/Merc:windows"

post-on-discord:
needs: [build-mac, build-windows]
if: ${{ !contains(github.event.head_commit.message, '@skip-notify') }}
if: ${{ github.event.ref == 'refs/heads/main' && !contains(github.event.head_commit.message, '@skip-notify') }}
runs-on: ubuntu-latest

steps:
Expand Down
Loading