Skip to content

Commit

Permalink
build: convert the game to godot 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
florianvazelle committed Jan 13, 2024
1 parent 7625fda commit fad833a
Show file tree
Hide file tree
Showing 317 changed files with 974 additions and 745 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Godot

GODOT_VERSION=4.1.3
GODOT_VERSION=4.2.1-stable

# Game

Expand Down
68 changes: 34 additions & 34 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
{
"regexManagers": [
{
"fileMatch": ["^plug\\.gd$"],
"matchStrings": [
"\\s+plug\\(\"(?<gitUrl>.*?)\",\\ \\{\\s*\"commit\":\\ \"(?<currentValue>)(?<currentDigest>.*?)\""
],
"depNameTemplate": "{{{gitUrl}}}",
"packageNameTemplate": "https://github.com/{{{gitUrl}}}",
"versioningTemplate": "git",
"datasourceTemplate": "git-refs"
},
{
"fileMatch": ["^plug\\.gd$"],
"matchStrings": [
"\\s+plug\\(\"(?<gitUrl>.*?)\",\\ \\{\\s*\"tag\":\\ \"(?<currentValue>)(?<currentDigest>.*?)\""
],
"depNameTemplate": "{{{gitUrl}}}",
"packageNameTemplate": "https://github.com/{{{gitUrl}}}",
"versioningTemplate": "git",
"datasourceTemplate": "git-tags"
},
{
"fileMatch": ["^.env$"],
"matchStrings": [
"GODOT_VERSION=(?<currentValue>.*?)\\n"
],
"depNameTemplate": "godotengine/godot",
"packageNameTemplate": "https://github.com/godotengine/godot",
"versioningTemplate": "loose",
"extractVersionTemplate": "^(?<version>.*)-stable$",
"datasourceTemplate": "git-tags"
}
]
}
"regexManagers": [
{
"fileMatch": ["^plug\\.gd$"],
"matchStrings": [
"\\s+plug\\(\"(?<gitUrl>.*?)\",\\ \\{\\s*\"commit\":\\ \"(?<currentValue>)(?<currentDigest>.*)\""
],
"depNameTemplate": "{{{gitUrl}}}",
"packageNameTemplate": "https://github.com/{{{gitUrl}}}",
"versioningTemplate": "git",
"datasourceTemplate": "git-refs"
},
{
"fileMatch": ["^plug\\.gd$"],
"matchStrings": [
"\\s+plug\\(\"(?<gitUrl>.*?)\",\\ \\{\\s*\"tag\":\\ \"(?<currentValue>.*)\""
],
"depNameTemplate": "{{{gitUrl}}}",
"packageNameTemplate": "https://github.com/{{{gitUrl}}}",
"versioningTemplate": "git",
"datasourceTemplate": "git-tags"
},
{
"fileMatch": ["^.env$"],
"matchStrings": [
"GODOT_VERSION=(?<currentValue>.*?)\\n"
],
"depNameTemplate": "godotengine/godot",
"packageNameTemplate": "https://github.com/godotengine/godot",
"versioningTemplate": "loose",
"extractVersionTemplate": "^(?<version>.*)$",
"datasourceTemplate": "git-tags"
}
]
}
73 changes: 59 additions & 14 deletions .github/workflows/release-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
lfs: true

- uses: extractions/setup-just@v1

- name: Load dotenv
Expand All @@ -39,11 +42,22 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
lfs: true

- uses: extractions/setup-just@v1

- name: Load dotenv
run: just ci-load-dotenv

- name: Cache Godot
uses: actions/cache@v3
with:
path: |
~/.mkflower/bin
~/.local/share/godot/export_templates
key: ${{ env.godot_version }}

- name: Export
run: just export

Expand All @@ -54,6 +68,46 @@ jobs:
path: dist/*
retention-days: 1

deploy:
runs-on: ubuntu-22.04
timeout-minutes: 30
needs: [check]

if: github.ref == 'refs/heads/main'

steps:
- uses: actions/checkout@v4
with:
lfs: true

- uses: extractions/setup-just@v1

- name: Cache Godot
uses: actions/cache@v3
with:
path: |
~/.mkflower/bin
~/.local/share/godot/export_templates
key: ${{ env.godot_version }}

- name: Load dotenv
run: just ci-load-dotenv

- name: Export
run: just export-web

# Installing rsync is needed in order to deploy to GitHub Pages. Without it, the build will fail.
- name: Install rsync
run: |
sudo apt-get update && sudo apt-get install -y rsync
- name: Deploy to GitHub Pages
uses: JamesIves/github-pages-deploy-action@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
folder: build/web

publish:
runs-on: ubuntu-22.04
timeout-minutes: 30
Expand All @@ -63,33 +117,24 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
lfs: true

- uses: extractions/setup-just@v1

- name: Load dotenv
run: just ci-load-dotenv

- name: Download artifact
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v3
with:
workflow: ${{ github.event.workflow_run.workflow_id }}
name: ${{ env.game_name }}-v${{ env.game_version }}
path: dist/
skip_unpack: false

- name: Publish
run: just publish
run: just ci-publish
env:
BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# # Installing rsync is needed in order to deploy to GitHub Pages. Without it, the build will fail.
# - name: Install rsync
# run: |
# apt-get update && apt-get install -y rsync
#
# - name: Deploy to GitHub Pages
# uses: JamesIves/github-pages-deploy-action@v4
# with:
# token: ${{ secrets.GITHUB_TOKEN }}
# branch: gh-pages
# folder: build/web
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Godot-specific ignores
.godot/
.godot/*
!.godot/imported/
!.godot/global_script_class_cache.cfg
.import/
gfxrecon_capture_*

Expand Down
109 changes: 109 additions & 0 deletions .godot/global_script_class_cache.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
list=Array[Dictionary]([{
"base": &"Node",
"class": &"AudioStreamPlayerPool",
"icon": "",
"language": &"GDScript",
"path": "res://addons/ez-sfx-and-music/scenes/AudioStreamPlayerPool/audio_stream_player_pool.gd"
}, {
"base": &"AudioStreamPlayer",
"class": &"AudioStreamPlayerWithFade",
"icon": "",
"language": &"GDScript",
"path": "res://addons/ez-sfx-and-music/scenes/AudioStreamPlayerWithFade/audio_stream_player_with_fade.gd"
}, {
"base": &"Ghost",
"class": &"BossGhost",
"icon": "",
"language": &"GDScript",
"path": "res://scripts/props/boss_ghost.gd"
}, {
"base": &"CanvasLayer",
"class": &"Fade",
"icon": "",
"language": &"GDScript",
"path": "res://addons/UniversalFade/Fade.gd"
}, {
"base": &"StaticBody3D",
"class": &"Ghost",
"icon": "",
"language": &"GDScript",
"path": "res://scripts/props/ghost.gd"
}, {
"base": &"Node3D",
"class": &"Healthbar3D",
"icon": "",
"language": &"GDScript",
"path": "res://scripts/gui/healthbar.gd"
}, {
"base": &"Control",
"class": &"Menu",
"icon": "",
"language": &"GDScript",
"path": "res://scripts/gui/menu.gd"
}, {
"base": &"CharacterBody3D",
"class": &"MovementController",
"icon": "",
"language": &"GDScript",
"path": "res://scripts/player/movement_controller.gd"
}, {
"base": &"Node",
"class": &"MusicPlayer",
"icon": "",
"language": &"GDScript",
"path": "res://addons/ez-sfx-and-music/scenes/MusicPlayer/music_player.gd"
}, {
"base": &"RichTextEffect",
"class": &"Nervous",
"icon": "",
"language": &"GDScript",
"path": "res://scripts/gui/nervous.gd"
}, {
"base": &"Control",
"class": &"Overlay",
"icon": "",
"language": &"GDScript",
"path": "res://scripts/gui/overlay.gd"
}, {
"base": &"Resource",
"class": &"ProtonScatterBaseShape",
"icon": "",
"language": &"GDScript",
"path": "res://addons/proton_scatter/src/shapes/base_shape.gd"
}, {
"base": &"ProtonScatterBaseShape",
"class": &"ProtonScatterBoxShape",
"icon": "",
"language": &"GDScript",
"path": "res://addons/proton_scatter/src/shapes/box_shape.gd"
}, {
"base": &"Resource",
"class": &"ProtonScatterCacheResource",
"icon": "",
"language": &"GDScript",
"path": "res://addons/proton_scatter/src/common/cache_resource.gd"
}, {
"base": &"ProtonScatterBaseShape",
"class": &"ProtonScatterPathShape",
"icon": "",
"language": &"GDScript",
"path": "res://addons/proton_scatter/src/shapes/path_shape.gd"
}, {
"base": &"ProtonScatterBaseShape",
"class": &"ProtonScatterSphereShape",
"icon": "",
"language": &"GDScript",
"path": "res://addons/proton_scatter/src/shapes/sphere_shape.gd"
}, {
"base": &"Node",
"class": &"Scenario",
"icon": "",
"language": &"GDScript",
"path": "res://scripts/scenario.gd"
}, {
"base": &"Node",
"class": &"SfxPlayer",
"icon": "",
"language": &"GDScript",
"path": "res://addons/ez-sfx-and-music/scenes/SfxPlayer/sfx_player.gd"
}])
3 changes: 3 additions & 0 deletions .godot/imported/0.ogg-3179700fe088088db8ceda12eeb30e3c.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="9e3a37a589c1e3a82521d3a6d036cec1"
dest_md5="76c1fba218f4e6c6ec27cd99a34f2d8d"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/0.ogg-e9e8cff724f6d52a9cd379f89de7366d.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="603b69b0ae3dee4a3d634191d1dd6624"
dest_md5="12f4ab0ee0e7c3e464ac85ec2b7642e6"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/1.ogg-505a94773df7b04b33321082eb1c0d28.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="216bb6f3426e3b20d76e94fbce257f64"
dest_md5="fa321811a1adc5026a0241df40ee27ae"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/1.ogg-fe6c4854b4685a8b714525fead435b69.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="1b51c7f8ca07f1ec47bf108456e9aba8"
dest_md5="3e3e6e0f773448df220f8aaf6d5ce8a4"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/2.ogg-ecc3f96acc35b9eefd8f7f915ff6ffa5.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="fc35f230d33696dcf6be4a5e68f31180"
dest_md5="e9fb4bd4c930bb89bc733fa77d9fcf06"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/2.ogg-fe10e3a63d86a006ce225b5e75b1bd4b.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="a66aa6ae1bba2bee2295afb23bd13b8f"
dest_md5="92af1441975de44b2e25b0b2d00c3c03"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/3.ogg-c40e68613a79b6723347c57eae50189e.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="73929c6b60004b96d5818036469cc2bd"
dest_md5="c8682c532eaa1c8a1081b52722c101a7"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/3.ogg-c648b2e4b9bc8501f2d13ed1eb879599.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="b08416f2a84cec71c50caef1f015abd0"
dest_md5="1665797028025e4577f63610352a7bca"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/4.ogg-7b3e638ccf6beab3ae3b6b91e4c651aa.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="75087bbe073c9a806c0e62b1ed723fa8"
dest_md5="b6012f1d0cf0407744c3484887b679bb"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/4.ogg-965a72546d819d04233bf1b40c6489f2.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="6e06fd029965c8a592a7978fbfa39390"
dest_md5="f58359d6d963959c667280724657dbad"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/5.ogg-4c07c61ec389e3e4d52927b378354b57.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="87ca2a172bbe9a6c56b1dabe1ca6581a"
dest_md5="11770561ad0cae01c76b7da77889ff1d"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/5.ogg-939cdc737740c2abacf5e13dd4e8de7e.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="7e78765f4aafae5ad0c26cbfd9369e24"
dest_md5="bede9fbf05c9ca421d3246f117a9263a"

Binary file not shown.
3 changes: 3 additions & 0 deletions .godot/imported/6.ogg-8cc7bc2b4e7841d7f36665f4be5ae0e4.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="668b37215697a0db2b715eaa4018ac8c"
dest_md5="c5066eb0c0f290b2b0723146e1f31cde"

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="8e0ca295e3615aad24275bd671ccbc6a"
dest_md5="7c6901c13b660992af9a7b7b8dfa78e6"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="61b1aaabf4edd677c40b1ececb683ada"
dest_md5="c0b59a88f3492c6b1c64adeecc0dc21b"

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="90abecfcd039eee6003182f47c7af00c"
dest_md5="ceda777caed27d34298707887114b918"

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="40d40b337eac661506f2dc9310ce36c3"
dest_md5="e6139a4b5f6eacb750c31a162478a8d9"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="181937023088bc898ec738c19aef32df"
dest_md5="123951f73c08b77dda6f4a461fbc4939"

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="12965d1751deaf68b5bd7553c315f1bc"
dest_md5="5eefff392b156c998242536a84949bfa"

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="e498578efefc577ddbb0e257552fac7d"
dest_md5="53934533203a8657f61908a5a02be5a1"

Binary file not shown.
Loading

0 comments on commit fad833a

Please sign in to comment.